@things-factory/accounting 8.0.0-alpha.3 → 8.0.0-alpha.31

package/server/service/payment/payment.ts

@@ -15,6 +15,7 @@ import { ObjectType, Field, ID, registerEnumType } from 'type-graphql'
 import { Domain } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { Transaction } from '../transaction/transaction'
+import { BankAccount } from 'service/bank-account/bank-account'
 
 export enum PaymentDirection {
   Incoming = 'Incoming', // 수금
@@ -26,6 +27,18 @@ registerEnumType(PaymentDirection, {
   description: 'Indicates whether the payment is incoming (received) or outgoing (paid)' // 결제 방향을 나타냅니다 (수금 또는 지출)
 })
 
+export enum PaymentType {
+  Transfer = 'Transfer', // 계좌 이체
+  Cash = 'Cash', // 현금
+  CreditCard = 'CreditCard', // 신용카드
+  DebitCard = 'DebitCard' // 직불카드
+}
+
+registerEnumType(PaymentType, {
+  name: 'PaymentType',
+  description: 'Type of the payment (e.g., Transfer, Cash, CreditCard, DebitCard)' // 결제 유형을 나타냅니다
+})
+
 @Entity()
 @Index('ix_payment_0', (payment: Payment) => [payment.domain, payment.transaction, payment.paidAt], {
   where: '"deleted_at" IS NULL',
@@ -71,6 +84,24 @@ export class Payment {
   @Field({ nullable: false, description: 'The amount of money involved in the payment' })
   amount: number // 결제된 금액
 
+  @Column({ type: 'enum', enum: PaymentType, nullable: false })
+  @Field(type => PaymentType, { description: 'Type of the payment' })
+  paymentType: PaymentType // 결제 유형
+
+  @ManyToOne(type => BankAccount, { nullable: true })
+  @Field(type => BankAccount, { nullable: true, description: 'Source bank account for the payment' })
+  sourceBankAccount?: BankAccount
+
+  @RelationId((payment: Payment) => payment.sourceBankAccount)
+  sourceBankAccountId?: string
+
+  @ManyToOne(type => BankAccount, { nullable: true })
+  @Field(type => BankAccount, { nullable: true, description: 'Destination bank account for the payment' })
+  destinationBankAccount?: BankAccount
+
+  @RelationId((payment: Payment) => payment.destinationBankAccount)
+  destinationBankAccountId?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true, description: 'Fiscal year in which the payment was made' })
   year?: number // 결제가 발생한 회계 연도

package/server/service/transaction/transaction-history.ts

@@ -148,8 +148,14 @@ export class TransactionHistory implements HistoryEntityInterface<Transaction> {
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
           ? 'varchar2'
-          : 'smallint',
-    enum: HistoryActionType
+          : DATABASE_TYPE == 'mssql'
+            ? 'nvarchar'
+            : 'varchar',
+    enum:
+      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? HistoryActionType
+        : undefined,
+    length: DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? undefined : 10
   })
   public action!: HistoryActionType
 }