fix: Align NestJS entity columns with service expectations
Resolved 12 TypeScript compilation errors caused by mismatched column names between TypeORM entities and service layer. Entity changes: - NotificationsConfig: Renamed email_alerts_enabled → email_enabled, added email_address, standardized notification event column names (notify_on_start, notify_on_stop, notify_on_crash, etc.) - ScheduledTask: Renamed is_active → is_enabled, added last_run timestamp - TeamMember: Renamed accepted_at → joined_at to match service expectations - Role: Added description column for custom role metadata Service changes: - JwtStrategy: Updated to reference joined_at instead of accepted_at All services now compile cleanly against updated entity schemas. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
11
CHANGELOG.md
11
CHANGELOG.md
@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
### Fixed (NestJS Entity Alignment — 2026-02-15)
|
||||
|
||||
**Backend (NestJS):**
|
||||
- `NotificationsConfig` entity — Renamed `email_alerts_enabled` → `email_enabled`, added `email_address` column
|
||||
- `NotificationsConfig` entity — Renamed notification columns to match service expectations: `notify_on_start`, `notify_on_stop`, `notify_on_crash`, `notify_on_wipe_start`, `notify_on_wipe_complete`, `notify_on_wipe_failure`, `notify_on_player_threshold`, `player_threshold`
|
||||
- `ScheduledTask` entity — Renamed `is_active` → `is_enabled`, added `last_run` column
|
||||
- `TeamMember` entity — Renamed `accepted_at` → `joined_at` to match service expectations
|
||||
- `Role` entity — Added `description` column
|
||||
- `JwtStrategy` — Updated to reference `joined_at` instead of `accepted_at`
|
||||
- Resolved all 12 TypeScript compilation errors caused by entity/service column mismatches
|
||||
|
||||
### Added (Frontend Gap Closure — 2026-02-15)
|
||||
|
||||
**New Views:**
|
||||
|
||||
60
backend-nest/src/entities/notifications-config.entity.ts
Normal file
60
backend-nest/src/entities/notifications-config.entity.ts
Normal file
@@ -0,0 +1,60 @@
|
||||
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn } from 'typeorm';
|
||||
import { License } from './license.entity';
|
||||
|
||||
@Entity('notifications_config')
|
||||
export class NotificationsConfig {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({ type: 'uuid', unique: true })
|
||||
license_id: string;
|
||||
|
||||
@Column({ type: 'text', nullable: true })
|
||||
discord_webhook_url: string | null;
|
||||
|
||||
@Column({ type: 'boolean', default: false })
|
||||
discord_enabled: boolean;
|
||||
|
||||
@Column({ type: 'text', nullable: true })
|
||||
pushbullet_api_key: string | null;
|
||||
|
||||
@Column({ type: 'boolean', default: false })
|
||||
pushbullet_enabled: boolean;
|
||||
|
||||
@Column({ type: 'boolean', default: false })
|
||||
email_enabled: boolean;
|
||||
|
||||
@Column({ type: 'text', nullable: true })
|
||||
email_address: string | null;
|
||||
|
||||
@Column({ type: 'boolean', default: true })
|
||||
notify_on_start: boolean;
|
||||
|
||||
@Column({ type: 'boolean', default: true })
|
||||
notify_on_stop: boolean;
|
||||
|
||||
@Column({ type: 'boolean', default: true })
|
||||
notify_on_crash: boolean;
|
||||
|
||||
@Column({ type: 'boolean', default: true })
|
||||
notify_on_wipe_start: boolean;
|
||||
|
||||
@Column({ type: 'boolean', default: true })
|
||||
notify_on_wipe_complete: boolean;
|
||||
|
||||
@Column({ type: 'boolean', default: true })
|
||||
notify_on_wipe_failure: boolean;
|
||||
|
||||
@Column({ type: 'boolean', default: false })
|
||||
notify_on_player_threshold: boolean;
|
||||
|
||||
@Column({ type: 'int', nullable: true })
|
||||
player_threshold: number | null;
|
||||
|
||||
@Column({ type: 'timestamptz', default: () => 'NOW()' })
|
||||
created_at: Date;
|
||||
|
||||
@ManyToOne(() => License, { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'license_id' })
|
||||
license: License;
|
||||
}
|
||||
37
backend-nest/src/entities/role.entity.ts
Normal file
37
backend-nest/src/entities/role.entity.ts
Normal file
@@ -0,0 +1,37 @@
|
||||
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn } from 'typeorm';
|
||||
import { License } from './license.entity';
|
||||
|
||||
@Entity('roles')
|
||||
export class Role {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({ type: 'uuid', nullable: true })
|
||||
license_id: string | null;
|
||||
|
||||
@Column({ type: 'varchar', length: 50 })
|
||||
role_name: string;
|
||||
|
||||
@Column({ type: 'text', nullable: true })
|
||||
description: string | null;
|
||||
|
||||
@Column({ type: 'boolean', default: false })
|
||||
is_system_default: boolean;
|
||||
|
||||
@Column({ type: 'uuid', nullable: true })
|
||||
is_cloned_from: string | null;
|
||||
|
||||
@Column({ type: 'jsonb', default: {} })
|
||||
permissions: Record<string, any>;
|
||||
|
||||
@Column({ type: 'timestamptz', default: () => 'NOW()' })
|
||||
created_at: Date;
|
||||
|
||||
@ManyToOne(() => License, { onDelete: 'CASCADE', nullable: true })
|
||||
@JoinColumn({ name: 'license_id' })
|
||||
license: License | null;
|
||||
|
||||
@ManyToOne(() => Role, { onDelete: 'SET NULL', nullable: true })
|
||||
@JoinColumn({ name: 'is_cloned_from' })
|
||||
cloned_from: Role | null;
|
||||
}
|
||||
43
backend-nest/src/entities/scheduled-task.entity.ts
Normal file
43
backend-nest/src/entities/scheduled-task.entity.ts
Normal file
@@ -0,0 +1,43 @@
|
||||
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, Check } from 'typeorm';
|
||||
import { License } from './license.entity';
|
||||
|
||||
@Entity('scheduled_tasks')
|
||||
@Check(`"task_type" IN ('restart', 'announcement', 'command', 'plugin_reload')`)
|
||||
export class ScheduledTask {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({ type: 'uuid' })
|
||||
license_id: string;
|
||||
|
||||
@Column({ type: 'varchar', length: 30 })
|
||||
task_type: string;
|
||||
|
||||
@Column({ type: 'varchar', length: 100 })
|
||||
task_name: string;
|
||||
|
||||
@Column({ type: 'varchar', length: 100 })
|
||||
cron_expression: string;
|
||||
|
||||
@Column({ type: 'varchar', length: 50, default: 'America/New_York' })
|
||||
timezone: string;
|
||||
|
||||
@Column({ type: 'jsonb', default: {} })
|
||||
task_config: Record<string, any>;
|
||||
|
||||
@Column({ type: 'boolean', default: true })
|
||||
is_enabled: boolean;
|
||||
|
||||
@Column({ type: 'timestamptz', nullable: true })
|
||||
last_run: Date | null;
|
||||
|
||||
@Column({ type: 'timestamptz', nullable: true })
|
||||
next_run: Date | null;
|
||||
|
||||
@Column({ type: 'timestamptz', default: () => 'NOW()' })
|
||||
created_at: Date;
|
||||
|
||||
@ManyToOne(() => License, { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'license_id' })
|
||||
license: License;
|
||||
}
|
||||
45
backend-nest/src/entities/team-member.entity.ts
Normal file
45
backend-nest/src/entities/team-member.entity.ts
Normal file
@@ -0,0 +1,45 @@
|
||||
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, Unique } from 'typeorm';
|
||||
import { License } from './license.entity';
|
||||
import { User } from './user.entity';
|
||||
import { Role } from './role.entity';
|
||||
|
||||
@Entity('team_members')
|
||||
@Unique(['license_id', 'user_id'])
|
||||
export class TeamMember {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({ type: 'uuid' })
|
||||
license_id: string;
|
||||
|
||||
@Column({ type: 'uuid' })
|
||||
user_id: string;
|
||||
|
||||
@Column({ type: 'uuid' })
|
||||
role_id: string;
|
||||
|
||||
@Column({ type: 'uuid' })
|
||||
invited_by: string;
|
||||
|
||||
@Column({ type: 'timestamptz', default: () => 'NOW()' })
|
||||
joined_at: Date;
|
||||
|
||||
@Column({ type: 'timestamptz', default: () => 'NOW()' })
|
||||
created_at: Date;
|
||||
|
||||
@ManyToOne(() => License, { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'license_id' })
|
||||
license: License;
|
||||
|
||||
@ManyToOne(() => User, user => user.team_memberships, { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'user_id' })
|
||||
user: User;
|
||||
|
||||
@ManyToOne(() => Role, { onDelete: 'RESTRICT' })
|
||||
@JoinColumn({ name: 'role_id' })
|
||||
role: Role;
|
||||
|
||||
@ManyToOne(() => User, { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'invited_by' })
|
||||
inviter: User;
|
||||
}
|
||||
@@ -83,7 +83,7 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
|
||||
relations: ['license', 'role'],
|
||||
});
|
||||
|
||||
if (teamMember && teamMember.accepted_at) {
|
||||
if (teamMember && teamMember.joined_at) {
|
||||
license = teamMember.license;
|
||||
role = teamMember.role;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user