add calendar module

server/src/entity/booking.entity.ts

@@ -0,0 +1,68 @@
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+  Index,
+} from 'typeorm';
+import { Event } from './event.entity';
+import { User } from './user';
+
+@Entity('bookings')
+@Index(['eventId', 'occurrenceStartTime']) // Index for fast lookups
+export class Booking {
+  @PrimaryGeneratedColumn({ type: 'bigint' })
+  id: number;
+
+  @Column({ name: 'occurrence_start_time', type: 'timestamptz' })
+  occurrenceStartTime: Date;
+
+  @Column({ name: 'notes', type: 'text', nullable: true })
+  notes: string;
+
+  @Column({ name: 'reserved_seats_count', type: 'integer', default: 1 })
+  reservedSeatsCount: number;
+
+  @CreateDateColumn({ name: 'created_at', type: 'timestamp' })
+  createdAt: Date;
+
+  @UpdateDateColumn({ name: 'updated_at', type: 'timestamp' })
+  updatedAt: Date;
+
+  // --- Cancellation Fields ---
+  @Column({ name: 'canceled_at', type: 'timestamp', nullable: true })
+  canceledAt: Date | null;
+
+  @Column({
+    name: 'canceled_reason',
+    type: 'varchar',
+    length: 50,
+    nullable: true,
+  })
+  canceledReason: string | null;
+
+  // --- Relationships ---
+  @Column({ name: 'event_id', type: 'bigint', nullable: true })
+  eventId: number | null;
+
+  @Column({ name: 'user_id', type: 'bigint', nullable: true })
+  userId: number | null;
+
+  @Column({ name: 'canceled_by_user_id', type: 'bigint', nullable: true })
+  canceledByUserId: number | null;
+
+  @ManyToOne(() => Event, { onDelete: 'SET NULL', nullable: true })
+  @JoinColumn({ name: 'event_id' })
+  event: Event;
+
+  @ManyToOne(() => User, { onDelete: 'SET NULL', nullable: true })
+  @JoinColumn({ name: 'user_id' })
+  user: User;
+
+  @ManyToOne(() => User, { onDelete: 'SET NULL', nullable: true })
+  @JoinColumn({ name: 'canceled_by_user_id' })
+  canceledByUser: User;
+}

server/src/entity/event-exception.entity.ts

@@ -1,52 +1,47 @@
-// dvbooking-cli/src/templates/nestjs/entity.ts.tpl
-
-import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm';
 import {
-  IsString,
-  IsNumber,
-  IsBoolean,
-  IsDate,
-  IsOptional,
-} from 'class-validator';
+  Column,
+  CreateDateColumn,
+  Entity,
+  JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+} from 'typeorm';
+import { Event } from './event.entity';
 
-@Entity({ name: 'event_exceptions' })
+@Entity('event_exceptions')
 export class EventException {
-  @PrimaryGeneratedColumn()
+  @PrimaryGeneratedColumn({ type: 'bigint' })
   id: number;
 
-  @Column()
-  @IsNumber()
-  event_id: number;
+  @Column({ name: 'original_start_time', type: 'timestamptz' })
+  originalStartTime: Date;
 
-  @Column()
-  @IsDate()
-  original_start_time: Date;
+  @Column({ name: 'is_cancelled', type: 'boolean', default: false })
+  isCancelled: boolean;
 
-  @Column({ default: false })
-  @IsBoolean()
-  is_cancelled: boolean = false;
+  @Column({ name: 'new_start_time', type: 'timestamptz', nullable: true })
+  newStartTime: Date;
 
-  @Column({ type: 'timestamp with time zone', nullable: true })
-  @IsOptional()
-  @IsDate()
-  new_start_time: Date | null;
+  @Column({ name: 'new_end_time', type: 'timestamptz', nullable: true })
+  newEndTime: Date;
 
-  @Column({ type: 'timestamp with time zone', nullable: true })
-  @IsOptional()
-  @IsDate()
-  new_end_time: Date | null;
+  @Column({ name: 'title', type: 'varchar', length: 255, nullable: true })
+  title: string;
 
-  @Column({ type: 'character varying', nullable: true })
-  @IsOptional()
-  @IsString()
-  title: string | null;
+  @Column({ name: 'description', type: 'text', nullable: true })
+  description: string;
 
-  @Column({ type: 'text', nullable: true })
-  @IsOptional()
-  @IsString()
-  description: string | null;
+  @CreateDateColumn({ name: 'created_at', type: 'timestamp' })
+  createdAt: Date;
 
-  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
-  @IsDate()
-  created_at: Date;
-}
+  // --- Relationships ---
+
+  @Column({ name: 'event_id', type: 'bigint' })
+  eventId: number;
+
+  @ManyToOne(() => Event, (event) => event.exceptions, {
+    onDelete: 'CASCADE', // If the parent event is deleted, delete its exceptions
+  })
+  @JoinColumn({ name: 'event_id' })
+  event: Event;
+}

server/src/entity/event-type.entity.ts

@@ -1,10 +1,8 @@
 // dvbooking-cli/src/templates/nestjs/entity.ts.tpl
 
-import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm';
-import {
-  IsString,
-  IsOptional,
-} from 'class-validator';
+import { Entity, PrimaryGeneratedColumn, Column, OneToMany } from 'typeorm';
+import { Event } from './event.entity';
+import { IsString, IsOptional } from 'class-validator';
 
 @Entity({ name: 'event_type' })
 export class EventType {
@@ -24,4 +22,7 @@ export class EventType {
   @IsOptional()
   @IsString()
   color: string | null;
+
+  @OneToMany(() => Event, (event) => event.eventType)
+  events: Event[];
 }

server/src/entity/event.entity.ts

@@ -1,54 +1,66 @@
-// dvbooking-cli/src/templates/nestjs/entity.ts.tpl
-
-import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm';
 import {
-  IsString,
-  IsNumber,
-  IsBoolean,
-  IsDate,
-  IsOptional,
-} from 'class-validator';
+  Column,
+  CreateDateColumn,
+  Entity,
+  ManyToOne,
+  OneToMany,
+  OneToOne,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+  JoinColumn,
+} from 'typeorm';
+import { EventType } from './event-type.entity';
+import { RecurrenceRule } from './recurrence-rule.entity';
+import { EventException } from './event-exception.entity';
 
-@Entity({ name: 'events' })
+@Entity('events')
 export class Event {
-  @PrimaryGeneratedColumn()
+  @PrimaryGeneratedColumn({ type: 'bigint' })
   id: number;
 
-  @Column({ type: 'bigint', nullable: true })
-  @IsOptional()
-  @IsNumber()
-  event_type_id: number | null;
-
-  @Column()
-  @IsString()
+  @Column({ name: 'title', type: 'varchar', length: 255 })
   title: string;
 
-  @Column({ type: 'text', nullable: true })
-  @IsOptional()
-  @IsString()
-  description: string | null;
+  @Column({ name: 'description', type: 'text', nullable: true })
+  description: string;
 
-  @Column()
-  @IsDate()
-  start_time: Date;
+  @Column({ name: 'start_time', type: 'timestamptz' })
+  startTime: Date;
 
-  @Column()
-  @IsDate()
-  end_time: Date;
+  @Column({ name: 'end_time', type: 'timestamptz' })
+  endTime: Date;
 
-  @Column()
-  @IsString()
+  @Column({ name: 'timezone', type: 'varchar', length: 50 })
   timezone: string;
 
-  @Column({ default: false })
-  @IsBoolean()
-  is_recurring: boolean = false;
+  @Column({ name: 'is_recurring', type: 'boolean', default: false })
+  isRecurring: boolean;
 
-  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
-  @IsDate()
-  created_at: Date;
+  @CreateDateColumn({ name: 'created_at', type: 'timestamp' })
+  createdAt: Date;
 
-  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
-  @IsDate()
-  updated_at: Date;
-}
+  @UpdateDateColumn({ name: 'updated_at', type: 'timestamp' })
+  updatedAt: Date;
+
+  // --- Relationships ---
+
+  @Column({ name: 'event_type_id', type: 'bigint', nullable: true })
+  eventTypeId: number;
+
+  @ManyToOne(() => EventType, (eventType) => eventType.events, {
+    nullable: true,
+    onDelete: 'SET NULL', // As requested for optional relationship
+  })
+  @JoinColumn({ name: 'event_type_id' })
+  eventType: EventType;
+
+  @OneToOne(() => RecurrenceRule, (rule) => rule.event, {
+    cascade: true, // Automatically save/update recurrence rule when event is saved
+  })
+  recurrenceRule: RecurrenceRule;
+
+  @OneToMany(() => EventException, (exception) => exception.event, {
+    cascade: true, // Automatically save/update exceptions when event is saved
+  })
+  exceptions: EventException[];
+}

server/src/entity/recurrence-rule.entity.ts

@@ -1,47 +1,46 @@
-// dvbooking-cli/src/templates/nestjs/entity.ts.tpl
+import {
+  Column,
+  Entity,
+  JoinColumn,
+  OneToOne,
+  PrimaryGeneratedColumn,
+} from 'typeorm';
+import { Event } from './event.entity';
 
-import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm';
-import { IsString, IsNumber, IsDate, IsOptional } from 'class-validator';
-
-@Entity({ name: 'recurrence_rules' })
+@Entity('recurrence_rules')
 export class RecurrenceRule {
-  @PrimaryGeneratedColumn()
+  @PrimaryGeneratedColumn({ type: 'bigint' })
   id: number;
 
-  @Column()
-  @IsNumber()
-  event_id: number;
+  @Column({ name: 'frequency', type: 'varchar', length: 10 })
+  frequency: 'DAILY' | 'WEEKLY' | 'MONTHLY' | 'YEARLY';
 
-  @Column()
-  @IsString()
-  frequency: string;
+  @Column({ name: 'interval', type: 'integer', default: 1 })
+  interval: number;
 
-  @Column({ default: '1' })
-  @IsNumber()
-  interval: number = 1;
+  @Column({ name: 'end_date', type: 'date', nullable: true })
+  endDate: Date;
 
-  @Column({ type: 'date', nullable: true })
-  @IsOptional()
-  @IsDate()
-  end_date: Date | null;
+  @Column({ name: 'count', type: 'integer', nullable: true })
+  count: number;
 
-  @Column({ type: 'integer', nullable: true })
-  @IsOptional()
-  @IsNumber()
-  count: number | null;
+  @Column({ name: 'by_day', type: 'varchar', length: 20, nullable: true })
+  byDay: string; // e.g., 'MO,TU,WE'
 
-  @Column({ type: 'character varying', nullable: true })
-  @IsOptional()
-  @IsString()
-  by_day: string | null;
+  @Column({ name: 'by_month_day', type: 'integer', nullable: true })
+  byMonthDay: number;
 
-  @Column({ type: 'integer', nullable: true })
-  @IsOptional()
-  @IsNumber()
-  by_month_day: number | null;
+  @Column({ name: 'by_month', type: 'integer', nullable: true })
+  byMonth: number;
 
-  @Column({ type: 'integer', nullable: true })
-  @IsOptional()
-  @IsNumber()
-  by_month: number | null;
+  // --- Relationships ---
+
+  @Column({ name: 'event_id', type: 'bigint' })
+  eventId: number;
+
+  @OneToOne(() => Event, (event) => event.recurrenceRule, {
+    onDelete: 'CASCADE', // If the parent event is deleted, delete the rule too
+  })
+  @JoinColumn({ name: 'event_id' })
+  event: Event;
 }