chore(payment): use generate schema (#13004)
Fixes: https://github.com/medusajs/medusa/issues/12959 Co-authored-by: Oli Juhl <59018053+olivermrbl@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
3fedb4c90c
commit
798ac0068e
5
.changeset/warm-sloths-pay.md
Normal file
5
.changeset/warm-sloths-pay.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
"@medusajs/payment": patch
|
||||
---
|
||||
|
||||
chore(payment): remove fixed schema from joiner config
|
||||
@@ -23,11 +23,13 @@ moduleIntegrationTestRunner<IPaymentModuleService>({
|
||||
service: PaymentModuleService,
|
||||
}).linkable
|
||||
|
||||
expect(Object.keys(linkable)).toHaveLength(6)
|
||||
expect(Object.keys(linkable)).toHaveLength(8)
|
||||
expect(Object.keys(linkable)).toEqual([
|
||||
"paymentCollection",
|
||||
"paymentSession",
|
||||
"payment",
|
||||
"capture",
|
||||
"refund",
|
||||
"refundReason",
|
||||
"accountHolder",
|
||||
"paymentProvider",
|
||||
@@ -38,58 +40,76 @@ moduleIntegrationTestRunner<IPaymentModuleService>({
|
||||
})
|
||||
|
||||
expect(linkable).toEqual({
|
||||
payment: {
|
||||
id: {
|
||||
linkable: "payment_id",
|
||||
entity: "Payment",
|
||||
primaryKey: "id",
|
||||
serviceName: "payment",
|
||||
field: "payment",
|
||||
},
|
||||
},
|
||||
paymentCollection: {
|
||||
id: {
|
||||
linkable: "payment_collection_id",
|
||||
entity: "PaymentCollection",
|
||||
primaryKey: "id",
|
||||
serviceName: "payment",
|
||||
field: "paymentCollection",
|
||||
entity: "PaymentCollection",
|
||||
},
|
||||
},
|
||||
paymentSession: {
|
||||
id: {
|
||||
field: "paymentSession",
|
||||
entity: "PaymentSession",
|
||||
linkable: "payment_session_id",
|
||||
primaryKey: "id",
|
||||
serviceName: "payment",
|
||||
field: "paymentSession",
|
||||
entity: "PaymentSession",
|
||||
},
|
||||
},
|
||||
payment: {
|
||||
id: {
|
||||
linkable: "payment_id",
|
||||
primaryKey: "id",
|
||||
serviceName: "payment",
|
||||
field: "payment",
|
||||
entity: "Payment",
|
||||
},
|
||||
},
|
||||
capture: {
|
||||
id: {
|
||||
linkable: "capture_id",
|
||||
primaryKey: "id",
|
||||
serviceName: "payment",
|
||||
field: "capture",
|
||||
entity: "Capture",
|
||||
},
|
||||
},
|
||||
refund: {
|
||||
id: {
|
||||
linkable: "refund_id",
|
||||
primaryKey: "id",
|
||||
serviceName: "payment",
|
||||
field: "refund",
|
||||
entity: "Refund",
|
||||
},
|
||||
},
|
||||
refundReason: {
|
||||
id: {
|
||||
linkable: "refund_reason_id",
|
||||
entity: "RefundReason",
|
||||
primaryKey: "id",
|
||||
serviceName: "payment",
|
||||
field: "refundReason",
|
||||
entity: "RefundReason",
|
||||
},
|
||||
},
|
||||
accountHolder: {
|
||||
id: {
|
||||
linkable: "account_holder_id",
|
||||
entity: "AccountHolder",
|
||||
primaryKey: "id",
|
||||
serviceName: "payment",
|
||||
field: "accountHolder",
|
||||
entity: "AccountHolder",
|
||||
},
|
||||
},
|
||||
paymentProvider: {
|
||||
id: {
|
||||
linkable: "payment_provider_id",
|
||||
entity: "PaymentProvider",
|
||||
primaryKey: "id",
|
||||
serviceName: "payment",
|
||||
field: "paymentProvider",
|
||||
entity: "PaymentProvider",
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
@@ -1,24 +1,13 @@
|
||||
import { defineJoinerConfig, Modules } from "@medusajs/framework/utils"
|
||||
import {
|
||||
AccountHolder,
|
||||
Payment,
|
||||
PaymentCollection,
|
||||
PaymentProvider,
|
||||
PaymentSession,
|
||||
RefundReason,
|
||||
AccountHolder,
|
||||
} from "@models"
|
||||
import { default as schema } from "./schema"
|
||||
|
||||
export const joinerConfig = defineJoinerConfig(Modules.PAYMENT, {
|
||||
schema,
|
||||
models: [
|
||||
Payment,
|
||||
PaymentCollection,
|
||||
PaymentProvider,
|
||||
PaymentSession,
|
||||
RefundReason,
|
||||
AccountHolder,
|
||||
],
|
||||
linkableKeys: {
|
||||
payment_id: Payment.name,
|
||||
payment_collection_id: PaymentCollection.name,
|
||||
|
||||
@@ -1,111 +0,0 @@
|
||||
export default `
|
||||
enum PaymentCollectionStatus {
|
||||
not_paid
|
||||
awaiting
|
||||
authorized
|
||||
partially_authorized
|
||||
canceled
|
||||
}
|
||||
|
||||
enum PaymentSessionStatus {
|
||||
authorized
|
||||
captured
|
||||
pending
|
||||
requires_more
|
||||
error
|
||||
canceled
|
||||
}
|
||||
|
||||
type PaymentCollection {
|
||||
id: ID!
|
||||
currency_code: String!
|
||||
region_id: String!
|
||||
amount: Float!
|
||||
authorized_amount: Float
|
||||
refunded_amount: Float
|
||||
captured_amount: Float
|
||||
completed_at: DateTime
|
||||
created_at: DateTime
|
||||
updated_at: DateTime
|
||||
metadata: JSON
|
||||
status: PaymentCollectionStatus!
|
||||
payment_providers: [PaymentProviderDTO!]!
|
||||
payment_sessions: [PaymentSessionDTO]
|
||||
payments: [PaymentDTO]
|
||||
}
|
||||
|
||||
type Payment {
|
||||
id: ID!
|
||||
amount: Float!
|
||||
raw_amount: Float
|
||||
authorized_amount: Float
|
||||
raw_authorized_amount: Float
|
||||
currency_code: String!
|
||||
provider_id: String!
|
||||
cart_id: String
|
||||
order_id: String
|
||||
order_edit_id: String
|
||||
customer_id: String
|
||||
data: JSON
|
||||
created_at: DateTime
|
||||
updated_at: DateTime
|
||||
captured_at: DateTime
|
||||
canceled_at: DateTime
|
||||
captured_amount: Float
|
||||
raw_captured_amount: Float
|
||||
refunded_amount: Float
|
||||
raw_refunded_amount: Float
|
||||
captures: [CaptureDTO]
|
||||
refunds: [RefundDTO]
|
||||
payment_collection_id: String!
|
||||
payment_collection: PaymentCollectionDTO
|
||||
payment_session: PaymentSessionDTO
|
||||
}
|
||||
|
||||
type Capture {
|
||||
id: ID!
|
||||
amount: Float!
|
||||
created_at: DateTime!
|
||||
created_by: String
|
||||
payment: Payment!
|
||||
}
|
||||
|
||||
type Refund {
|
||||
id: ID!
|
||||
amount: Float!
|
||||
refund_reason_id: String
|
||||
refund_reason: RefundReason
|
||||
note: String
|
||||
created_at: DateTime!
|
||||
created_by: String
|
||||
payment: Payment!
|
||||
}
|
||||
|
||||
type PaymentSession {
|
||||
id: ID!
|
||||
amount: Float!
|
||||
currency_code: String!
|
||||
provider_id: String!
|
||||
data: JSON!
|
||||
context: JSON
|
||||
status: PaymentSessionStatus!
|
||||
authorized_at: DateTime
|
||||
payment_collection_id: String!
|
||||
payment_collection: PaymentCollection
|
||||
payment: Payment
|
||||
}
|
||||
|
||||
type PaymentProvider {
|
||||
id: ID!
|
||||
is_enabled: String!
|
||||
}
|
||||
|
||||
type RefundReason {
|
||||
id: ID!
|
||||
label: String!
|
||||
description: String
|
||||
metadata: JSON
|
||||
created_at: DateTime!
|
||||
updated_at: DateTime!
|
||||
}
|
||||
`
|
||||
Reference in New Issue
Block a user