Skip to content

Commit 798ac00

Browse files
chore(payment): use generate schema (medusajs#13004)
Fixes: medusajs#12959 Co-authored-by: Oli Juhl <[email protected]>
1 parent 3fedb4c commit 798ac00

File tree

4 files changed

+39
-136
lines changed

4 files changed

+39
-136
lines changed

.changeset/warm-sloths-pay.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/payment": patch
3+
---
4+
5+
chore(payment): remove fixed schema from joiner config

packages/modules/payment/integration-tests/__tests__/services/payment-module/index.spec.ts

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@ moduleIntegrationTestRunner<IPaymentModuleService>({
2323
service: PaymentModuleService,
2424
}).linkable
2525

26-
expect(Object.keys(linkable)).toHaveLength(6)
26+
expect(Object.keys(linkable)).toHaveLength(8)
2727
expect(Object.keys(linkable)).toEqual([
2828
"paymentCollection",
2929
"paymentSession",
3030
"payment",
31+
"capture",
32+
"refund",
3133
"refundReason",
3234
"accountHolder",
3335
"paymentProvider",
@@ -38,58 +40,76 @@ moduleIntegrationTestRunner<IPaymentModuleService>({
3840
})
3941

4042
expect(linkable).toEqual({
43+
paymentCollection: {
44+
id: {
45+
linkable: "payment_collection_id",
46+
primaryKey: "id",
47+
serviceName: "payment",
48+
field: "paymentCollection",
49+
entity: "PaymentCollection",
50+
},
51+
},
52+
paymentSession: {
53+
id: {
54+
linkable: "payment_session_id",
55+
primaryKey: "id",
56+
serviceName: "payment",
57+
field: "paymentSession",
58+
entity: "PaymentSession",
59+
},
60+
},
4161
payment: {
4262
id: {
4363
linkable: "payment_id",
44-
entity: "Payment",
4564
primaryKey: "id",
4665
serviceName: "payment",
4766
field: "payment",
67+
entity: "Payment",
4868
},
4969
},
50-
paymentCollection: {
70+
capture: {
5171
id: {
52-
linkable: "payment_collection_id",
53-
entity: "PaymentCollection",
72+
linkable: "capture_id",
5473
primaryKey: "id",
5574
serviceName: "payment",
56-
field: "paymentCollection",
75+
field: "capture",
76+
entity: "Capture",
5777
},
5878
},
59-
paymentSession: {
79+
refund: {
6080
id: {
61-
field: "paymentSession",
62-
entity: "PaymentSession",
63-
linkable: "payment_session_id",
81+
linkable: "refund_id",
6482
primaryKey: "id",
6583
serviceName: "payment",
84+
field: "refund",
85+
entity: "Refund",
6686
},
6787
},
6888
refundReason: {
6989
id: {
7090
linkable: "refund_reason_id",
71-
entity: "RefundReason",
7291
primaryKey: "id",
7392
serviceName: "payment",
7493
field: "refundReason",
94+
entity: "RefundReason",
7595
},
7696
},
7797
accountHolder: {
7898
id: {
7999
linkable: "account_holder_id",
80-
entity: "AccountHolder",
81100
primaryKey: "id",
82101
serviceName: "payment",
83102
field: "accountHolder",
103+
entity: "AccountHolder",
84104
},
85105
},
86106
paymentProvider: {
87107
id: {
88108
linkable: "payment_provider_id",
89-
entity: "PaymentProvider",
90109
primaryKey: "id",
91110
serviceName: "payment",
92111
field: "paymentProvider",
112+
entity: "PaymentProvider",
93113
},
94114
},
95115
})

packages/modules/payment/src/joiner-config.ts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,13 @@
11
import { defineJoinerConfig, Modules } from "@medusajs/framework/utils"
22
import {
3+
AccountHolder,
34
Payment,
45
PaymentCollection,
56
PaymentProvider,
6-
PaymentSession,
77
RefundReason,
8-
AccountHolder,
98
} from "@models"
10-
import { default as schema } from "./schema"
119

1210
export const joinerConfig = defineJoinerConfig(Modules.PAYMENT, {
13-
schema,
14-
models: [
15-
Payment,
16-
PaymentCollection,
17-
PaymentProvider,
18-
PaymentSession,
19-
RefundReason,
20-
AccountHolder,
21-
],
2211
linkableKeys: {
2312
payment_id: Payment.name,
2413
payment_collection_id: PaymentCollection.name,

packages/modules/payment/src/schema/index.ts

Lines changed: 0 additions & 111 deletions
This file was deleted.

0 commit comments

Comments
 (0)