From 68fc37f713568170a518c966c10e5b72835e32e8 Mon Sep 17 00:00:00 2001 From: fadlydev Date: Sat, 1 Feb 2025 11:43:43 +0700 Subject: [PATCH] update relation request submission --- src/entity/request_orders.ts | 1 - src/entity/request_submission.ts | 20 ++++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/entity/request_orders.ts b/src/entity/request_orders.ts index 78e2a6a..eb00686 100644 --- a/src/entity/request_orders.ts +++ b/src/entity/request_orders.ts @@ -33,7 +33,6 @@ export class RequestOrder { order_number: string; @Column({ - type: 'date', nullable: false, }) order_date: Date; diff --git a/src/entity/request_submission.ts b/src/entity/request_submission.ts index 6eadb1e..7357608 100644 --- a/src/entity/request_submission.ts +++ b/src/entity/request_submission.ts @@ -5,8 +5,13 @@ import { CreateDateColumn, UpdateDateColumn, DeleteDateColumn, + ManyToOne, + JoinColumn } from 'typeorm'; +import { RequestOrder + + } from './request_orders'; enum ApprovalStatus { PENDING = 'PENDING', APPROVED = 'APPROVED', @@ -17,14 +22,9 @@ enum ApprovalStatus { export class RequestSubmission { @PrimaryGeneratedColumn('uuid') id: string; - - @Column({ - type: 'uuid', - array: true, - nullable: false, - }) - request_order_id: string[]; - + @ManyToOne(() => RequestOrder, { nullable: true }) + @JoinColumn({ name: 'request_order_id' }) + request_order: RequestOrder; @Column({ nullable: false, type: 'varchar', @@ -76,6 +76,10 @@ export class RequestSubmission { }) gm_approval_status: ApprovalStatus; + // Store multiple + @Column('uuid', { array: true, nullable: true }) + request_order_ids: string[]; + @Column({ nullable: false, type: 'varchar',