feat: add rental_category/rate to Room, rental_type/tenant_id to Occupancy, tenant_id to Student

apps/server/src/entities/occupancy.entity.ts

@@ -8,6 +8,7 @@ import {
 } from 'typeorm';
 import { Student } from './student.entity';
 import { Room } from './room.entity';
+import { Tenant } from './tenant.entity';
 
 @Entity('occupancies')
 export class Occupancy {
@@ -38,6 +39,16 @@ export class Occupancy {
   @Column({ type: 'text', nullable: true })
   notes: string;
 
+  @Column({ name: 'rental_type', length: 10, default: 'short' })
+  rentalType: string;
+
+  @Column({ name: 'tenant_id', type: 'integer', nullable: true })
+  tenantId: number;
+
+  @ManyToOne(() => Tenant, { nullable: true })
+  @JoinColumn({ name: 'tenant_id' })
+  tenant: Tenant;
+
   @CreateDateColumn({ name: 'created_at' })
   createdAt: Date;
 

apps/server/src/entities/room.entity.ts

@@ -28,6 +28,12 @@ export class Room {
   @Column({ length: 10, nullable: true })
   gender: string;
 
+  @Column({ name: 'rental_category', length: 10, default: 'short' })
+  rentalCategory: string;
+
+  @Column({ name: 'monthly_rate', type: 'decimal', precision: 10, scale: 2, default: 0 })
+  monthlyRate: number;
+
   @CreateDateColumn({ name: 'created_at' })
   createdAt: Date;
 

apps/server/src/entities/student.entity.ts

@@ -4,11 +4,14 @@ import {
   Column,
   CreateDateColumn,
   UpdateDateColumn,
+  ManyToOne,
+  JoinColumn,
   OneToMany,
 } from 'typeorm';
 import { Occupancy } from './occupancy.entity';
 import { PersonalExpense } from './personal-expense.entity';
 import { Bill } from './bill.entity';
+import { Tenant } from './tenant.entity';
 
 @Entity('students')
 export class Student {
@@ -54,6 +57,13 @@ export class Student {
   @OneToMany(() => Occupancy, (o) => o.student)
   occupancies: Occupancy[];
 
+  @Column({ name: 'tenant_id', type: 'integer', nullable: true })
+  tenantId: number;
+
+  @ManyToOne(() => Tenant, { nullable: true })
+  @JoinColumn({ name: 'tenant_id' })
+  tenant: Tenant;
+
   @OneToMany(() => PersonalExpense, (e) => e.student)
   personalExpenses: PersonalExpense[];
 

apps/server/src/occupancies/dto/occupancy.dto.ts

@@ -17,6 +17,14 @@ export class CheckInDto {
   @IsOptional()
   @IsString()
   notes?: string;
+
+  @IsOptional()
+  @IsString()
+  rentalType?: string;
+
+  @IsOptional()
+  @IsInt()
+  tenantId?: number;
 }
 
 export class CheckOutDto {

apps/server/src/occupancies/occupancies.service.ts

@@ -65,6 +65,8 @@ export class OccupanciesService {
       roomId: dto.roomId,
       checkInDate: dto.checkInDate,
       billingStartDate: dto.billingStartDate || dto.checkInDate,
+      rentalType: dto.rentalType,
+      tenantId: dto.tenantId,
       notes: dto.notes,
     });
     const saved = await this.repo.save(occ);

apps/server/src/rooms/dto/room.dto.ts

@@ -1,4 +1,4 @@
-import { IsString, IsOptional, IsInt, IsEnum, Min } from 'class-validator';
+import { IsString, IsOptional, IsInt, IsEnum, Min, IsNumber } from 'class-validator';
 
 export class CreateRoomDto {
   @IsString()
@@ -19,6 +19,14 @@ export class CreateRoomDto {
   @IsOptional()
   @IsString()
   roomType?: string;
+
+  @IsOptional()
+  @IsString()
+  rentalCategory?: string;
+
+  @IsOptional()
+  @IsNumber()
+  monthlyRate?: number;
 }
 
 export class UpdateRoomDto {
@@ -50,4 +58,12 @@ export class UpdateRoomDto {
   @IsOptional()
   @IsEnum(['available', 'full', 'maintenance'])
   status?: string;
+
+  @IsOptional()
+  @IsString()
+  rentalCategory?: string;
+
+  @IsOptional()
+  @IsNumber()
+  monthlyRate?: number;
 }