From a6fbb71251f4c10b09fbbf5c45c96ec4a686bfba Mon Sep 17 00:00:00 2001 From: wangziqi Date: Thu, 9 Jul 2026 11:52:34 +0800 Subject: [PATCH] feat: add bed_id and locker_id to Occupancy entity --- apps/server/src/entities/occupancy.entity.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/apps/server/src/entities/occupancy.entity.ts b/apps/server/src/entities/occupancy.entity.ts index dbabe41..77dca0c 100644 --- a/apps/server/src/entities/occupancy.entity.ts +++ b/apps/server/src/entities/occupancy.entity.ts @@ -9,6 +9,8 @@ import { import { Student } from './student.entity'; import { Room } from './room.entity'; import { Tenant } from './tenant.entity'; +import { Bed } from './bed.entity'; +import { Locker } from './locker.entity'; import { Department } from './department.entity'; @Entity('occupancies') @@ -40,6 +42,20 @@ export class Occupancy { @Column({ type: 'text', nullable: true }) notes: string; + @Column({ name: 'bed_id', type: 'integer', nullable: true }) + bedId: number; + + @ManyToOne(() => Bed, { nullable: true }) + @JoinColumn({ name: 'bed_id' }) + bed: Bed; + + @Column({ name: 'locker_id', type: 'integer', nullable: true }) + lockerId: number; + + @ManyToOne(() => Locker, { nullable: true }) + @JoinColumn({ name: 'locker_id' }) + locker: Locker; + @Column({ name: 'rental_type', length: 10, default: 'short' }) rentalType: string;