Replace PayU integration with Razorpay
All checks were successful
build-and-deploy / build-deploy (push) Successful in 33s
All checks were successful
build-and-deploy / build-deploy (push) Successful in 33s
This commit is contained in:
@@ -1,79 +0,0 @@
|
||||
package com.android.trisolarisserver.models.payment
|
||||
|
||||
import com.android.trisolarisserver.models.booking.Booking
|
||||
import com.android.trisolarisserver.models.property.Property
|
||||
import jakarta.persistence.Column
|
||||
import jakarta.persistence.Entity
|
||||
import jakarta.persistence.FetchType
|
||||
import jakarta.persistence.GeneratedValue
|
||||
import jakarta.persistence.Id
|
||||
import jakarta.persistence.JoinColumn
|
||||
import jakarta.persistence.ManyToOne
|
||||
import jakarta.persistence.Table
|
||||
import java.time.OffsetDateTime
|
||||
import java.util.UUID
|
||||
|
||||
@Entity
|
||||
@Table(name = "payu_payment_attempt")
|
||||
class PayuPaymentAttempt(
|
||||
@Id
|
||||
@GeneratedValue
|
||||
@Column(columnDefinition = "uuid")
|
||||
val id: UUID? = null,
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "property_id", nullable = false)
|
||||
var property: Property,
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "booking_id")
|
||||
var booking: Booking? = null,
|
||||
|
||||
@Column(name = "status")
|
||||
var status: String? = null,
|
||||
|
||||
@Column(name = "unmapped_status")
|
||||
var unmappedStatus: String? = null,
|
||||
|
||||
@Column(name = "amount")
|
||||
var amount: Long? = null,
|
||||
|
||||
@Column(name = "currency")
|
||||
var currency: String? = null,
|
||||
|
||||
@Column(name = "gateway_payment_id")
|
||||
var gatewayPaymentId: String? = null,
|
||||
|
||||
@Column(name = "gateway_txn_id")
|
||||
var gatewayTxnId: String? = null,
|
||||
|
||||
@Column(name = "bank_ref_num")
|
||||
var bankRefNum: String? = null,
|
||||
|
||||
@Column(name = "mode")
|
||||
var mode: String? = null,
|
||||
|
||||
@Column(name = "pg_type")
|
||||
var pgType: String? = null,
|
||||
|
||||
@Column(name = "payer_vpa")
|
||||
var payerVpa: String? = null,
|
||||
|
||||
@Column(name = "payer_name")
|
||||
var payerName: String? = null,
|
||||
|
||||
@Column(name = "payment_source")
|
||||
var paymentSource: String? = null,
|
||||
|
||||
@Column(name = "error_code")
|
||||
var errorCode: String? = null,
|
||||
|
||||
@Column(name = "error_message")
|
||||
var errorMessage: String? = null,
|
||||
|
||||
@Column(name = "payload", columnDefinition = "text")
|
||||
var payload: String? = null,
|
||||
|
||||
@Column(name = "received_at", columnDefinition = "timestamptz")
|
||||
var receivedAt: OffsetDateTime = OffsetDateTime.now()
|
||||
)
|
||||
@@ -1,51 +0,0 @@
|
||||
package com.android.trisolarisserver.models.payment
|
||||
|
||||
import com.android.trisolarisserver.models.property.Property
|
||||
import jakarta.persistence.Column
|
||||
import jakarta.persistence.Entity
|
||||
import jakarta.persistence.FetchType
|
||||
import jakarta.persistence.GeneratedValue
|
||||
import jakarta.persistence.Id
|
||||
import jakarta.persistence.JoinColumn
|
||||
import jakarta.persistence.ManyToOne
|
||||
import jakarta.persistence.Table
|
||||
import jakarta.persistence.UniqueConstraint
|
||||
import java.time.OffsetDateTime
|
||||
import java.util.UUID
|
||||
|
||||
@Entity
|
||||
@Table(
|
||||
name = "payu_payment_link_settings",
|
||||
uniqueConstraints = [UniqueConstraint(columnNames = ["property_id"])]
|
||||
)
|
||||
class PayuPaymentLinkSettings(
|
||||
@Id
|
||||
@GeneratedValue
|
||||
@Column(columnDefinition = "uuid")
|
||||
val id: UUID? = null,
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "property_id", nullable = false)
|
||||
var property: Property,
|
||||
|
||||
@Column(name = "merchant_id", nullable = false, columnDefinition = "text")
|
||||
var merchantId: String,
|
||||
|
||||
@Column(name = "client_id", columnDefinition = "text")
|
||||
var clientId: String? = null,
|
||||
|
||||
@Column(name = "client_secret", columnDefinition = "text")
|
||||
var clientSecret: String? = null,
|
||||
|
||||
@Column(name = "access_token", columnDefinition = "text")
|
||||
var accessToken: String? = null,
|
||||
|
||||
@Column(name = "token_expires_at", columnDefinition = "timestamptz")
|
||||
var tokenExpiresAt: OffsetDateTime? = null,
|
||||
|
||||
@Column(name = "is_test", nullable = false)
|
||||
var isTest: Boolean = false,
|
||||
|
||||
@Column(name = "updated_at", columnDefinition = "timestamptz")
|
||||
var updatedAt: OffsetDateTime = OffsetDateTime.now()
|
||||
)
|
||||
@@ -1,51 +0,0 @@
|
||||
package com.android.trisolarisserver.models.payment
|
||||
|
||||
import com.android.trisolarisserver.models.property.Property
|
||||
import jakarta.persistence.Column
|
||||
import jakarta.persistence.Entity
|
||||
import jakarta.persistence.FetchType
|
||||
import jakarta.persistence.GeneratedValue
|
||||
import jakarta.persistence.Id
|
||||
import jakarta.persistence.JoinColumn
|
||||
import jakarta.persistence.ManyToOne
|
||||
import jakarta.persistence.Table
|
||||
import jakarta.persistence.UniqueConstraint
|
||||
import java.time.OffsetDateTime
|
||||
import java.util.UUID
|
||||
|
||||
@Entity
|
||||
@Table(
|
||||
name = "payu_settings",
|
||||
uniqueConstraints = [UniqueConstraint(columnNames = ["property_id"])]
|
||||
)
|
||||
class PayuSettings(
|
||||
@Id
|
||||
@GeneratedValue
|
||||
@Column(columnDefinition = "uuid")
|
||||
val id: UUID? = null,
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "property_id", nullable = false)
|
||||
var property: Property,
|
||||
|
||||
@Column(name = "merchant_key", nullable = false, columnDefinition = "text")
|
||||
var merchantKey: String,
|
||||
|
||||
@Column(name = "salt_32", columnDefinition = "text")
|
||||
var salt32: String? = null,
|
||||
|
||||
@Column(name = "salt_256", columnDefinition = "text")
|
||||
var salt256: String? = null,
|
||||
|
||||
@Column(name = "base_url", nullable = false, columnDefinition = "text")
|
||||
var baseUrl: String = "https://secure.payu.in/_payment",
|
||||
|
||||
@Column(name = "is_test", nullable = false)
|
||||
var isTest: Boolean = false,
|
||||
|
||||
@Column(name = "use_salt_256", nullable = false)
|
||||
var useSalt256: Boolean = true,
|
||||
|
||||
@Column(name = "updated_at", nullable = false, columnDefinition = "timestamptz")
|
||||
var updatedAt: OffsetDateTime = OffsetDateTime.now()
|
||||
)
|
||||
@@ -0,0 +1,48 @@
|
||||
package com.android.trisolarisserver.models.payment
|
||||
|
||||
import com.android.trisolarisserver.models.booking.Booking
|
||||
import com.android.trisolarisserver.models.property.Property
|
||||
import jakarta.persistence.*
|
||||
import java.time.OffsetDateTime
|
||||
import java.util.UUID
|
||||
|
||||
@Entity
|
||||
@Table(name = "razorpay_payment_attempt")
|
||||
class RazorpayPaymentAttempt(
|
||||
@Id
|
||||
@GeneratedValue
|
||||
@Column(columnDefinition = "uuid")
|
||||
val id: UUID? = null,
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "property_id", nullable = false)
|
||||
var property: Property,
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "booking_id")
|
||||
var booking: Booking? = null,
|
||||
|
||||
@Column(name = "event")
|
||||
var event: String? = null,
|
||||
|
||||
@Column(name = "status")
|
||||
var status: String? = null,
|
||||
|
||||
@Column(name = "amount")
|
||||
var amount: Long? = null,
|
||||
|
||||
@Column(name = "currency")
|
||||
var currency: String? = null,
|
||||
|
||||
@Column(name = "payment_id")
|
||||
var paymentId: String? = null,
|
||||
|
||||
@Column(name = "order_id")
|
||||
var orderId: String? = null,
|
||||
|
||||
@Column(name = "payload")
|
||||
var payload: String? = null,
|
||||
|
||||
@Column(name = "received_at", nullable = false, columnDefinition = "timestamptz")
|
||||
var receivedAt: OffsetDateTime = OffsetDateTime.now()
|
||||
)
|
||||
@@ -0,0 +1,48 @@
|
||||
package com.android.trisolarisserver.models.payment
|
||||
|
||||
import com.android.trisolarisserver.models.booking.Booking
|
||||
import com.android.trisolarisserver.models.property.Property
|
||||
import jakarta.persistence.*
|
||||
import java.time.OffsetDateTime
|
||||
import java.util.UUID
|
||||
|
||||
@Entity
|
||||
@Table(name = "razorpay_payment_link_request")
|
||||
class RazorpayPaymentLinkRequest(
|
||||
@Id
|
||||
@GeneratedValue
|
||||
@Column(columnDefinition = "uuid")
|
||||
val id: UUID? = null,
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "property_id", nullable = false)
|
||||
var property: Property,
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "booking_id", nullable = false)
|
||||
var booking: Booking,
|
||||
|
||||
@Column(name = "payment_link_id")
|
||||
var paymentLinkId: String? = null,
|
||||
|
||||
@Column(name = "amount")
|
||||
var amount: Long,
|
||||
|
||||
@Column(name = "currency")
|
||||
var currency: String,
|
||||
|
||||
@Column(name = "status")
|
||||
var status: String,
|
||||
|
||||
@Column(name = "short_url")
|
||||
var shortUrl: String? = null,
|
||||
|
||||
@Column(name = "request_payload")
|
||||
var requestPayload: String? = null,
|
||||
|
||||
@Column(name = "response_payload")
|
||||
var responsePayload: String? = null,
|
||||
|
||||
@Column(name = "created_at", nullable = false, columnDefinition = "timestamptz")
|
||||
val createdAt: OffsetDateTime = OffsetDateTime.now()
|
||||
)
|
||||
@@ -2,22 +2,13 @@ package com.android.trisolarisserver.models.payment
|
||||
|
||||
import com.android.trisolarisserver.models.booking.Booking
|
||||
import com.android.trisolarisserver.models.property.Property
|
||||
import jakarta.persistence.Column
|
||||
import jakarta.persistence.Entity
|
||||
import jakarta.persistence.EnumType
|
||||
import jakarta.persistence.Enumerated
|
||||
import jakarta.persistence.FetchType
|
||||
import jakarta.persistence.GeneratedValue
|
||||
import jakarta.persistence.Id
|
||||
import jakarta.persistence.JoinColumn
|
||||
import jakarta.persistence.ManyToOne
|
||||
import jakarta.persistence.Table
|
||||
import jakarta.persistence.*
|
||||
import java.time.OffsetDateTime
|
||||
import java.util.UUID
|
||||
|
||||
@Entity
|
||||
@Table(name = "payu_qr_request")
|
||||
class PayuQrRequest(
|
||||
@Table(name = "razorpay_qr_request")
|
||||
class RazorpayQrRequest(
|
||||
@Id
|
||||
@GeneratedValue
|
||||
@Column(columnDefinition = "uuid")
|
||||
@@ -31,23 +22,25 @@ class PayuQrRequest(
|
||||
@JoinColumn(name = "booking_id", nullable = false)
|
||||
var booking: Booking,
|
||||
|
||||
@Column(name = "txnid", nullable = false)
|
||||
var txnid: String,
|
||||
@Column(name = "qr_id")
|
||||
var qrId: String? = null,
|
||||
|
||||
@Column(name = "amount", nullable = false)
|
||||
@Column(name = "amount")
|
||||
var amount: Long,
|
||||
|
||||
@Column(name = "currency", nullable = false)
|
||||
@Column(name = "currency")
|
||||
var currency: String,
|
||||
|
||||
@Enumerated(EnumType.STRING)
|
||||
@Column(name = "status", nullable = false)
|
||||
var status: PayuQrStatus = PayuQrStatus.CREATED,
|
||||
@Column(name = "status")
|
||||
var status: String,
|
||||
|
||||
@Column(name = "request_payload", columnDefinition = "text")
|
||||
@Column(name = "image_url")
|
||||
var imageUrl: String? = null,
|
||||
|
||||
@Column(name = "request_payload")
|
||||
var requestPayload: String? = null,
|
||||
|
||||
@Column(name = "response_payload", columnDefinition = "text")
|
||||
@Column(name = "response_payload")
|
||||
var responsePayload: String? = null,
|
||||
|
||||
@Column(name = "expiry_at", columnDefinition = "timestamptz")
|
||||
@@ -56,10 +49,3 @@ class PayuQrRequest(
|
||||
@Column(name = "created_at", nullable = false, columnDefinition = "timestamptz")
|
||||
val createdAt: OffsetDateTime = OffsetDateTime.now()
|
||||
)
|
||||
|
||||
enum class PayuQrStatus {
|
||||
CREATED,
|
||||
SENT,
|
||||
SUCCESS,
|
||||
FAILED
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package com.android.trisolarisserver.models.payment
|
||||
|
||||
import com.android.trisolarisserver.models.property.Property
|
||||
import jakarta.persistence.*
|
||||
import java.time.OffsetDateTime
|
||||
import java.util.UUID
|
||||
|
||||
@Entity
|
||||
@Table(name = "razorpay_settings")
|
||||
class RazorpaySettings(
|
||||
@Id
|
||||
@GeneratedValue
|
||||
@Column(columnDefinition = "uuid")
|
||||
val id: UUID? = null,
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "property_id", nullable = false, unique = true)
|
||||
var property: Property,
|
||||
|
||||
@Column(name = "key_id", nullable = false)
|
||||
var keyId: String,
|
||||
|
||||
@Column(name = "key_secret", nullable = false)
|
||||
var keySecret: String,
|
||||
|
||||
@Column(name = "webhook_secret")
|
||||
var webhookSecret: String? = null,
|
||||
|
||||
@Column(name = "is_test", nullable = false)
|
||||
var isTest: Boolean = false,
|
||||
|
||||
@Column(name = "updated_at", nullable = false, columnDefinition = "timestamptz")
|
||||
var updatedAt: OffsetDateTime = OffsetDateTime.now()
|
||||
)
|
||||
@@ -1,20 +1,13 @@
|
||||
package com.android.trisolarisserver.models.payment
|
||||
|
||||
import com.android.trisolarisserver.models.property.Property
|
||||
import jakarta.persistence.Column
|
||||
import jakarta.persistence.Entity
|
||||
import jakarta.persistence.FetchType
|
||||
import jakarta.persistence.GeneratedValue
|
||||
import jakarta.persistence.Id
|
||||
import jakarta.persistence.JoinColumn
|
||||
import jakarta.persistence.ManyToOne
|
||||
import jakarta.persistence.Table
|
||||
import jakarta.persistence.*
|
||||
import java.time.OffsetDateTime
|
||||
import java.util.UUID
|
||||
|
||||
@Entity
|
||||
@Table(name = "payu_webhook_log")
|
||||
class PayuWebhookLog(
|
||||
@Table(name = "razorpay_webhook_log")
|
||||
class RazorpayWebhookLog(
|
||||
@Id
|
||||
@GeneratedValue
|
||||
@Column(columnDefinition = "uuid")
|
||||
@@ -24,15 +17,15 @@ class PayuWebhookLog(
|
||||
@JoinColumn(name = "property_id", nullable = false)
|
||||
var property: Property,
|
||||
|
||||
@Column(name = "headers", columnDefinition = "text")
|
||||
@Column(name = "headers")
|
||||
var headers: String? = null,
|
||||
|
||||
@Column(name = "payload", columnDefinition = "text")
|
||||
@Column(name = "payload")
|
||||
var payload: String? = null,
|
||||
|
||||
@Column(name = "content_type")
|
||||
var contentType: String? = null,
|
||||
|
||||
@Column(name = "received_at", nullable = false, columnDefinition = "timestamptz")
|
||||
val receivedAt: OffsetDateTime = OffsetDateTime.now()
|
||||
var receivedAt: OffsetDateTime = OffsetDateTime.now()
|
||||
)
|
||||
Reference in New Issue
Block a user