fix: update models

packages/payment/src/models/capture.ts

@@ -11,7 +11,7 @@ import {
 import { generateEntityId } from "@medusajs/utils"
 import Payment from "./payment"
 
-type OptionalCaptureProps = "created_by" | "created_at"
+type OptionalCaptureProps = "created_at"
 
 @Entity({ tableName: "capture" })
 export default class Capture {
@@ -41,7 +41,7 @@ export default class Capture {
   created_at: Date
 
   @Property({ columnType: "text", nullable: true })
-  created_by: string | null
+  created_by?: string | null
 
   @BeforeCreate()
   onCreate() {

packages/payment/src/models/payment-collection.ts

@@ -23,13 +23,7 @@ import PaymentProvider from "./payment-provider"
 import PaymentSession from "./payment-session"
 import Payment from "./payment"
 
-type OptionalPaymentCollectionProps =
-  | "authorized_amount"
-  | "refunded_amount"
-  | "region_id"
-  | "completed_at"
-  | "status"
-  | DAL.SoftDeletableEntityDateColumns
+type OptionalPaymentCollectionProps = "status" | DAL.EntityDateColumns
 
 @Entity({ tableName: "payment_collection" })
 @Filter(DALUtils.mikroOrmSoftDeletableFilterOptions)
@@ -53,14 +47,14 @@ export default class PaymentCollection {
     nullable: true,
     serializer: Number,
   })
-  authorized_amount: number | null
+  authorized_amount?: number | null
 
   @Property({
     columnType: "numeric",
     nullable: true,
     serializer: Number,
   })
-  refunded_amount: number | null
+  refunded_amount?: number | null
 
   @Property({ columnType: "text", nullable: true })
   region_id?: string | null
@@ -85,19 +79,19 @@ export default class PaymentCollection {
     nullable: true,
     index: "IDX_payment_collection_deleted_at",
   })
-  deleted_at: Date | null
+  deleted_at?: Date | null
 
   @Property({
     columnType: "timestamptz",
     nullable: true,
   })
-  completed_at: Date | null
+  completed_at?: Date | null
 
   @Enum({
     items: () => PaymentCollectionStatus,
     default: PaymentCollectionStatus.NOT_PAID,
   })
-  status?: PaymentCollectionStatus = PaymentCollectionStatus.NOT_PAID
+  status: PaymentCollectionStatus = PaymentCollectionStatus.NOT_PAID
 
   @ManyToMany(() => PaymentProvider)
   payment_providers = new Collection<PaymentProvider>(this)

packages/payment/src/models/payment-method-token.ts

@@ -2,23 +2,14 @@ import {
   BeforeCreate,
   Entity,
   OnInit,
-  OptionalProps,
   PrimaryKey,
   Property,
 } from "@mikro-orm/core"
 
 import { generateEntityId } from "@medusajs/utils"
 
-type OptionalPaymentMethodTokenProps =
-  | "data"
-  | "type_detail"
-  | "description_detail"
-  | "metadata"
-
 @Entity({ tableName: "payment_method_token" })
 export default class PaymentMethodToken {
-  [OptionalProps]?: OptionalPaymentMethodTokenProps
-
   @PrimaryKey({ columnType: "text" })
   id: string
 
@@ -32,10 +23,10 @@ export default class PaymentMethodToken {
   name: string
 
   @Property({ columnType: "text", nullable: true })
-  type_detail: string | null
+  type_detail?: string | null
 
   @Property({ columnType: "text", nullable: true })
-  description_detail: string | null
+  description_detail?: string | null
 
   @Property({ columnType: "jsonb", nullable: true })
   metadata?: Record<string, unknown> | null

packages/payment/src/models/payment-provider.ts

@@ -1,7 +1,9 @@
-import { Entity, PrimaryKey, Property } from "@mikro-orm/core"
+import { Entity, OptionalProps, PrimaryKey, Property } from "@mikro-orm/core"
 
 @Entity({ tableName: "payment_provider" })
 export default class PaymentProvider {
+  [OptionalProps]?: "is_enabled"
+
   @PrimaryKey({ columnType: "text" })
   id: string
 

packages/payment/src/models/payment-session.ts

@@ -5,26 +5,16 @@ import {
   ManyToOne,
   OneToOne,
   OnInit,
-  OptionalProps,
   PrimaryKey,
   Property,
 } from "@mikro-orm/core"
-import { DAL } from "@medusajs/types"
 import { generateEntityId, PaymentSessionStatus } from "@medusajs/utils"
 
 import PaymentCollection from "./payment-collection"
 import Payment from "./payment"
 
-type OptionalPaymentSessionProps =
-  | "data"
-  | "is_selected"
-  | "authorized_at"
-  | DAL.EntityDateColumns
-
 @Entity({ tableName: "payment_session" })
 export default class PaymentSession {
-  [OptionalProps]?: OptionalPaymentSessionProps
-
   @PrimaryKey({ columnType: "text" })
   id: string
 
@@ -49,13 +39,13 @@ export default class PaymentSession {
   status: PaymentSessionStatus
 
   @Property({ columnType: "boolean", nullable: true })
-  is_selected: boolean | null
+  is_selected?: boolean | null
 
   @Property({
     columnType: "timestamptz",
     nullable: true,
   })
-  authorized_at: Date | null
+  authorized_at?: Date | null
 
   @ManyToOne({
     index: "IDX_payment_session_payment_collection_id",

packages/payment/src/models/payment.ts

@@ -20,15 +20,7 @@ import Capture from "./capture"
 import PaymentSession from "./payment-session"
 import PaymentCollection from "./payment-collection"
 
-type OptionalPaymentProps =
-  | "authorized_amount"
-  | "cart_id"
-  | "order_id"
-  | "customer_id"
-  | "data"
-  | "captured_at"
-  | "canceled_at"
-  | DAL.SoftDeletableEntityDateColumns
+type OptionalPaymentProps = DAL.EntityDateColumns
 
 @Entity({ tableName: "payment" })
 @Filter(DALUtils.mikroOrmSoftDeletableFilterOptions)
@@ -49,7 +41,7 @@ export default class Payment {
     nullable: true,
     serializer: Number,
   })
-  authorized_amount: number | null
+  authorized_amount?: number | null
 
   @Property({ columnType: "text" })
   currency_code: string
@@ -58,16 +50,16 @@ export default class Payment {
   provider_id: string
 
   @Property({ columnType: "text", nullable: true })
-  cart_id: string | null
+  cart_id?: string | null
 
   @Property({ columnType: "text", nullable: true })
-  order_id: string | null
+  order_id?: string | null
 
   @Property({ columnType: "text", nullable: true })
-  order_edit_id: string | null
+  order_edit_id?: string | null
 
   @Property({ columnType: "text", nullable: true })
-  customer_id: string | null
+  customer_id?: string | null
 
   @Property({ columnType: "jsonb", nullable: true })
   data?: Record<string, unknown> | null
@@ -92,19 +84,19 @@ export default class Payment {
     nullable: true,
     index: "IDX_payment_deleted_at",
   })
-  deleted_at: Date | null
+  deleted_at?: Date | null
 
   @Property({
     columnType: "timestamptz",
     nullable: true,
   })
-  captured_at: Date | null
+  captured_at?: Date | null
 
   @Property({
     columnType: "timestamptz",
     nullable: true,
   })
-  canceled_at: Date | null
+  canceled_at?: Date | null
 
   @OneToMany(() => Refund, (refund) => refund.payment, {
     cascade: [Cascade.REMOVE],
@@ -120,7 +112,7 @@ export default class Payment {
     index: "IDX_payment_payment_collection_id",
     fieldName: "payment_collection_id",
   })
-  payment_collection!: PaymentCollection
+  payment_collection: PaymentCollection
 
   @OneToOne({ owner: true, fieldName: "session_id" })
   session: PaymentSession

packages/payment/src/models/refund.ts

@@ -3,7 +3,6 @@ import {
   Entity,
   ManyToOne,
   OnInit,
-  OptionalProps,
   PrimaryKey,
   Property,
 } from "@mikro-orm/core"
@@ -11,12 +10,8 @@ import {
 import { generateEntityId } from "@medusajs/utils"
 import Payment from "./payment"
 
-type OptionalRefundProps = "created_by"
-
 @Entity({ tableName: "refund" })
 export default class Refund {
-  [OptionalProps]?: OptionalRefundProps
-
   @PrimaryKey({ columnType: "text" })
   id: string
 
@@ -41,7 +36,7 @@ export default class Refund {
   created_at: Date
 
   @Property({ columnType: "text", nullable: true })
-  created_by: string | null
+  created_by?: string | null
 
   @BeforeCreate()
   onCreate() {