From 3f2f661e9b89a011b865a648c7bb98c2af3a2829 Mon Sep 17 00:00:00 2001 From: "fazri.is" Date: Wed, 15 Apr 2026 10:04:29 +0700 Subject: [PATCH] update --- src/entity/queue_monitoring.ts | 37 +++++--------- src/entity/queue_monitoring_rooms.ts | 43 ++++++++++++++++ src/schema/public.ts | 76 ++++++++++++++-------------- 3 files changed, 95 insertions(+), 61 deletions(-) create mode 100644 src/entity/queue_monitoring_rooms.ts diff --git a/src/entity/queue_monitoring.ts b/src/entity/queue_monitoring.ts index 0b1ec2c..3c8bd1e 100644 --- a/src/entity/queue_monitoring.ts +++ b/src/entity/queue_monitoring.ts @@ -1,41 +1,32 @@ -import { - Entity, - PrimaryGeneratedColumn, - Column, - CreateDateColumn, - UpdateDateColumn, - DeleteDateColumn, - ManyToMany, - JoinTable, -} from 'typeorm'; +import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, ManyToMany, JoinTable } from "typeorm"; -import { Status } from '../types/status'; -import { Room } from './room'; +import { Status } from "../types/status"; +import { Room } from "./room"; -@Entity('queue_monitorings') +@Entity("queue_monitorings") export class QueueMonitoring { - @PrimaryGeneratedColumn('uuid') + @PrimaryGeneratedColumn("uuid") id: string; @Column({ - type: 'text', + type: "text", nullable: false, }) name: string; @Column({ - type: 'text', + type: "text", nullable: false, }) slug: string; - @ManyToMany(() => Room, { onDelete: 'NO ACTION' }) - @JoinTable({ - name: 'queue_monitoring_rooms', - joinColumn: { name: 'queue_monitoring_id', referencedColumnName: 'id' }, - inverseJoinColumn: { name: 'room_id', referencedColumnName: 'id' }, - }) - rooms: Room[]; + // @ManyToMany(() => Room, { onDelete: 'NO ACTION' }) + // @JoinTable({ + // name: 'queue_monitoring_rooms', + // joinColumn: { name: 'queue_monitoring_id', referencedColumnName: 'id' }, + // inverseJoinColumn: { name: 'room_id', referencedColumnName: 'id' }, + // }) + // rooms: Room[]; @Column({ nullable: false, diff --git a/src/entity/queue_monitoring_rooms.ts b/src/entity/queue_monitoring_rooms.ts new file mode 100644 index 0000000..0ba713e --- /dev/null +++ b/src/entity/queue_monitoring_rooms.ts @@ -0,0 +1,43 @@ +import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, ManyToOne, JoinColumn } from "typeorm"; + +import { Status } from "../types/status"; +import { QueueMonitoring } from "./queue_monitoring"; +import { Room } from "./room"; + +@Entity("queue_monitoring_rooms") +export class QueueMonitoringRooms { + @PrimaryGeneratedColumn("uuid") + id: string; + + @ManyToOne(() => QueueMonitoring, { onDelete: "NO ACTION" }) + @JoinColumn() + queue_monitoring: QueueMonitoring; + + @ManyToOne(() => Room, { onDelete: "NO ACTION" }) + @JoinColumn() + room: Room; + + @Column({ + nullable: false, + length: 64, + }) + status: Status; + + @CreateDateColumn() + created_at: Date; + + @Column({ nullable: true, length: 256 }) + created_by: string; + + @UpdateDateColumn({ nullable: true }) + updated_at: Date; + + @Column({ nullable: true, length: 256 }) + updated_by: string; + + @DeleteDateColumn({ nullable: true }) + deleted_at: Date; + + @Column({ nullable: true, length: 256 }) + deleted_by: string; +} diff --git a/src/schema/public.ts b/src/schema/public.ts index 3e1ec63..34c3fe4 100644 --- a/src/schema/public.ts +++ b/src/schema/public.ts @@ -8,43 +8,44 @@ export * from "../entity/aldeia"; export * from "../entity/district"; export * from "../entity/munisipo"; export * from "../entity/suco"; -export * from "../entity/application" -export * from "../entity/nationality" -export * from "../entity/diagnosis" -export * from "../entity/diagnostic_procedure" -export * from "../entity/room" -export * from "../entity/service_type" -export * from "../entity/service_class" -export * from "../entity/service" -export * from "../entity/service_fare" -export * from "../entity/service_package" -export * from "../entity/department" -export * from "../entity/doctor_schedule" -export * from "../entity/schedule_series" -export * from "../entity/schedule_exceptions" -export * from "../entity/doctor_item" -export * from "../entity/doctor_item_package" -export * from "../entity/measurement_unit" -export * from "../entity/reference_range" -export * from "../entity/queue_monitoring" -export * from "../entity/examination_detail" -export * from "../entity/examination_type" -export * from "../entity/examination_detail" -export * from "../entity/measurement_unit" -export * from "../entity/hospital_information" -export * from "../entity/patient_group" -export * from "../entity/patient_guarantor" -export * from "../entity/user_to_room" -export * from "../entity/refferal_hospital" -export * from "../entity/room_to_pharmacy" -export * from "../entity/faretype" -export * from "../entity/card_type" -export * from "../entity/payment_method" -export * from "../entity/registrationfee" -export * from "../entity/province" -export * from "../entity/city" -export * from "../entity/subdistrict" -export * from "../entity/ward" +export * from "../entity/application"; +export * from "../entity/nationality"; +export * from "../entity/diagnosis"; +export * from "../entity/diagnostic_procedure"; +export * from "../entity/room"; +export * from "../entity/service_type"; +export * from "../entity/service_class"; +export * from "../entity/service"; +export * from "../entity/service_fare"; +export * from "../entity/service_package"; +export * from "../entity/department"; +export * from "../entity/doctor_schedule"; +export * from "../entity/schedule_series"; +export * from "../entity/schedule_exceptions"; +export * from "../entity/doctor_item"; +export * from "../entity/doctor_item_package"; +export * from "../entity/measurement_unit"; +export * from "../entity/reference_range"; +export * from "../entity/queue_monitoring"; +export * from "../entity/queue_monitoring_rooms"; +export * from "../entity/examination_detail"; +export * from "../entity/examination_type"; +export * from "../entity/examination_detail"; +export * from "../entity/measurement_unit"; +export * from "../entity/hospital_information"; +export * from "../entity/patient_group"; +export * from "../entity/patient_guarantor"; +export * from "../entity/user_to_room"; +export * from "../entity/refferal_hospital"; +export * from "../entity/room_to_pharmacy"; +export * from "../entity/faretype"; +export * from "../entity/card_type"; +export * from "../entity/payment_method"; +export * from "../entity/registrationfee"; +export * from "../entity/province"; +export * from "../entity/city"; +export * from "../entity/subdistrict"; +export * from "../entity/ward"; export * from "../entity/responsible_party_consent"; export * from "../types/action"; @@ -54,4 +55,3 @@ export * from "../types/role"; export * from "../types/status"; export * from "../types/email"; export * from "../types/telegram"; -