Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added .codex
Empty file.
246 changes: 229 additions & 17 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/ab-testing/entities/experiment-variant.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
PrimaryGeneratedColumn,
CreateDateColumn,
UpdateDateColumn,
DeleteDateColumn,
ManyToOne,
OneToMany,
} from 'typeorm';
Expand Down Expand Up @@ -39,6 +40,9 @@ export class ExperimentVariant {
@UpdateDateColumn()
updatedAt: Date;

@DeleteDateColumn()
deletedAt?: Date;

@ManyToOne(() => Experiment, (experiment) => experiment.variants)
experiment: Experiment;

Expand Down
2 changes: 1 addition & 1 deletion src/ab-testing/experiments/experiment.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export class ExperimentService {
*/
async removeVariant(variantId: string): Promise<void> {
this.logger.log(`Removing variant: ${variantId}`);
await this.variantRepository.delete(variantId);
await this.variantRepository.softDelete(variantId);
this.logger.log(`Variant removed: ${variantId}`);
}

Expand Down
16 changes: 15 additions & 1 deletion src/assessment/assessments.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { AssessmentAttempt } from './entities/assessment-attempt.entity';
import { FeedbackGenerationService } from './feedback/feedback-generation.service';
import { Answer } from './entities/answer.entity';
import { ScoreCalculationService } from './scoring/score-calculation.service';
import { Question } from './entities/question.entity';

@Injectable()
export class AssessmentsService {
Expand Down Expand Up @@ -65,7 +66,20 @@ export class AssessmentsService {
}

async remove(id: string): Promise<void> {
await this.assessmentRepo.delete(id);
const assessment = await this.findOne(id);
if (!assessment) {
return;
}

await this.assessmentRepo.manager.transaction(async (manager) => {
await manager
.getRepository(Question)
.createQueryBuilder()
.softDelete()
.where(`"assessmentId" = :assessmentId`, { assessmentId: id })
.execute();
await manager.getRepository(Assessment).softDelete(id);
});
}

async submitAssessment(attemptId: string, answers: any[]) {
Expand Down
12 changes: 11 additions & 1 deletion src/assessment/entities/assessment.entity.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
import { Column, CreateDateColumn, Entity, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
import {
Column,
CreateDateColumn,
DeleteDateColumn,
Entity,
OneToMany,
PrimaryGeneratedColumn,
} from 'typeorm';
import { Question } from './question.entity';

@Entity()
Expand All @@ -22,4 +29,7 @@ export class Assessment {

@CreateDateColumn()
createdAt: Date;

@DeleteDateColumn()
deletedAt?: Date;
}
5 changes: 4 additions & 1 deletion src/assessment/entities/question.entity.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
import { Column, DeleteDateColumn, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
import { QuestionType } from '../enums/question-type.enum';
import { Assessment } from './assessment.entity';

Expand Down Expand Up @@ -26,4 +26,7 @@ export class Question {
onDelete: 'CASCADE',
})
assessment: Assessment;

@DeleteDateColumn()
deletedAt?: Date;
}
60 changes: 48 additions & 12 deletions src/audit-log/audit-log.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ import {
ParseIntPipe,
DefaultValuePipe,
} from '@nestjs/common';
import { ApiTags, ApiOperation, ApiResponse, ApiQuery, ApiParam, ApiBearerAuth } from '@nestjs/swagger';
import {
ApiTags,
ApiOperation,
ApiResponse,
ApiQuery,
ApiParam,
ApiBearerAuth,
} from '@nestjs/swagger';
import { Response } from 'express';
import { AuditLogService, AuditLogSearchFilters } from './audit-log.service';
import { AuditLog } from './audit-log.entity';
Expand All @@ -32,9 +39,21 @@ export class AuditLogController {
@ApiOperation({ summary: 'Search audit logs with filters' })
@ApiQuery({ name: 'userId', required: false, description: 'Filter by user ID' })
@ApiQuery({ name: 'userEmail', required: false, description: 'Filter by user email' })
@ApiQuery({ name: 'actions', required: false, description: 'Filter by actions (comma-separated)' })
@ApiQuery({ name: 'categories', required: false, description: 'Filter by categories (comma-separated)' })
@ApiQuery({ name: 'severities', required: false, description: 'Filter by severities (comma-separated)' })
@ApiQuery({
name: 'actions',
required: false,
description: 'Filter by actions (comma-separated)',
})
@ApiQuery({
name: 'categories',
required: false,
description: 'Filter by categories (comma-separated)',
})
@ApiQuery({
name: 'severities',
required: false,
description: 'Filter by severities (comma-separated)',
})
@ApiQuery({ name: 'entityType', required: false, description: 'Filter by entity type' })
@ApiQuery({ name: 'entityId', required: false, description: 'Filter by entity ID' })
@ApiQuery({ name: 'ipAddress', required: false, description: 'Filter by IP address' })
Expand Down Expand Up @@ -90,7 +109,12 @@ export class AuditLogController {

@Get('recent')
@ApiOperation({ summary: 'Get recent audit logs' })
@ApiQuery({ name: 'limit', required: false, description: 'Number of logs to return', type: Number })
@ApiQuery({
name: 'limit',
required: false,
description: 'Number of logs to return',
type: Number,
})
@ApiResponse({ status: 200, description: 'Recent audit logs' })
async getRecent(
@Query('limit', new DefaultValuePipe(100), ParseIntPipe) limit?: number,
Expand All @@ -101,7 +125,12 @@ export class AuditLogController {
@Get('user/:userId')
@ApiOperation({ summary: 'Get audit logs for a specific user' })
@ApiParam({ name: 'userId', description: 'User ID' })
@ApiQuery({ name: 'limit', required: false, description: 'Number of logs to return', type: Number })
@ApiQuery({
name: 'limit',
required: false,
description: 'Number of logs to return',
type: Number,
})
@ApiResponse({ status: 200, description: 'User audit logs' })
async getByUser(
@Param('userId') userId: string,
Expand All @@ -114,7 +143,12 @@ export class AuditLogController {
@ApiOperation({ summary: 'Get audit logs for a specific entity' })
@ApiParam({ name: 'entityType', description: 'Entity type (e.g., user, course)' })
@ApiParam({ name: 'entityId', description: 'Entity ID' })
@ApiQuery({ name: 'limit', required: false, description: 'Number of logs to return', type: Number })
@ApiQuery({
name: 'limit',
required: false,
description: 'Number of logs to return',
type: Number,
})
@ApiResponse({ status: 200, description: 'Entity audit logs' })
async getByEntity(
@Param('entityType') entityType: string,
Expand All @@ -127,7 +161,12 @@ export class AuditLogController {
@Get('ip/:ipAddress')
@ApiOperation({ summary: 'Get audit logs by IP address' })
@ApiParam({ name: 'ipAddress', description: 'IP address' })
@ApiQuery({ name: 'limit', required: false, description: 'Number of logs to return', type: Number })
@ApiQuery({
name: 'limit',
required: false,
description: 'Number of logs to return',
type: Number,
})
@ApiResponse({ status: 200, description: 'IP audit logs' })
async getByIpAddress(
@Param('ipAddress') ipAddress: string,
Expand All @@ -148,10 +187,7 @@ export class AuditLogController {
@ApiQuery({ name: 'startDate', required: true, description: 'Start date (ISO 8601)' })
@ApiQuery({ name: 'endDate', required: true, description: 'End date (ISO 8601)' })
@ApiResponse({ status: 200, description: 'Audit report' })
async generateReport(
@Query('startDate') startDate: string,
@Query('endDate') endDate: string,
) {
async generateReport(@Query('startDate') startDate: string, @Query('endDate') endDate: string) {
if (!startDate || !endDate) {
throw new HttpException('Start date and end date are required', HttpStatus.BAD_REQUEST);
}
Expand Down
17 changes: 3 additions & 14 deletions src/audit-log/audit-log.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,9 @@ import { AuditLogInterceptor } from './interceptors/audit-log.interceptor';
import { AuditRetentionTask } from './tasks/audit-retention.task';

@Module({
imports: [
TypeOrmModule.forFeature([AuditLog]),
ConfigModule,
ScheduleModule.forRoot(),
],
imports: [TypeOrmModule.forFeature([AuditLog]), ConfigModule, ScheduleModule.forRoot()],
controllers: [AuditLogController],
providers: [
AuditLogService,
AuditLogInterceptor,
AuditRetentionTask,
],
exports: [
AuditLogService,
AuditLogInterceptor,
],
providers: [AuditLogService, AuditLogInterceptor, AuditRetentionTask],
exports: [AuditLogService, AuditLogInterceptor],
})
export class AuditLogModule {}
18 changes: 15 additions & 3 deletions src/audit-log/decorators/audit.decorator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ export const AuditCreate = (entityType: string, options?: Partial<AuditLogOption
...options,
});

export const AuditUpdate = (entityType: string, entityIdParam: string, options?: Partial<AuditLogOptions>) =>
export const AuditUpdate = (
entityType: string,
entityIdParam: string,
options?: Partial<AuditLogOptions>,
) =>
AuditLog({
action: AuditAction.DATA_UPDATED,
category: AuditCategory.DATA_MODIFICATION,
Expand All @@ -41,7 +45,11 @@ export const AuditUpdate = (entityType: string, entityIdParam: string, options?:
...options,
});

export const AuditDelete = (entityType: string, entityIdParam: string, options?: Partial<AuditLogOptions>) =>
export const AuditDelete = (
entityType: string,
entityIdParam: string,
options?: Partial<AuditLogOptions>,
) =>
AuditLog({
action: AuditAction.DATA_DELETED,
category: AuditCategory.DATA_MODIFICATION,
Expand All @@ -51,7 +59,11 @@ export const AuditDelete = (entityType: string, entityIdParam: string, options?:
...options,
});

export const AuditView = (entityType: string, entityIdParam?: string, options?: Partial<AuditLogOptions>) =>
export const AuditView = (
entityType: string,
entityIdParam?: string,
options?: Partial<AuditLogOptions>,
) =>
AuditLog({
action: AuditAction.DATA_VIEWED,
category: AuditCategory.DATA_ACCESS,
Expand Down
26 changes: 8 additions & 18 deletions src/audit-log/interceptors/audit-log.interceptor.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
import {
Injectable,
NestInterceptor,
ExecutionContext,
CallHandler,
Logger,
} from '@nestjs/common';
import { Injectable, NestInterceptor, ExecutionContext, CallHandler, Logger } from '@nestjs/common';
import { Observable } from 'rxjs';
import { tap } from 'rxjs/operators';
import { AuditLogService } from '../audit-log.service';
Expand All @@ -31,14 +25,7 @@ export class AuditLogInterceptor implements NestInterceptor {
const response = context.switchToHttp().getResponse();
const startTime = Date.now();

const {
method,
path,
ip,
headers,
user,
requestId,
} = request;
const { method, path, ip, headers, user, requestId } = request;

const userAgent = headers['user-agent'] || 'Unknown';
const userId = user?.id || null;
Expand Down Expand Up @@ -96,9 +83,12 @@ export class AuditLogInterceptor implements NestInterceptor {
return;
}

const severity = statusCode >= 500 ? AuditSeverity.ERROR :
statusCode >= 400 ? AuditSeverity.WARNING :
AuditSeverity.INFO;
const severity =
statusCode >= 500
? AuditSeverity.ERROR
: statusCode >= 400
? AuditSeverity.WARNING
: AuditSeverity.INFO;

await this.auditLogService.log({
userId: userId || undefined,
Expand Down
13 changes: 11 additions & 2 deletions src/auth/auth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,11 @@ export class AuthService {
private readonly auditLogService: AuditLogService,
) {}

async register(registerDto: RegisterDto, ipAddress?: string, userAgent?: string): Promise<RegisterResponse> {
async register(
registerDto: RegisterDto,
ipAddress?: string,
userAgent?: string,
): Promise<RegisterResponse> {
return await this.transactionService.runInTransaction(async (_manager) => {
// Create user
const user = await this.usersService.create(registerDto);
Expand Down Expand Up @@ -254,7 +258,12 @@ export class AuthService {
}
}

async logout(userId: string, sessionId?: string, ipAddress?: string, userAgent?: string): Promise<{ message: string }> {
async logout(
userId: string,
sessionId?: string,
ipAddress?: string,
userAgent?: string,
): Promise<{ message: string }> {
const user = await this.usersService.findOne(userId);

await this.sessionService.withLock(`logout:${userId}`, async () => {
Expand Down
7 changes: 6 additions & 1 deletion src/backup/backup.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,12 @@ export class BackupService {
);

if (shouldRetry) {
this.scheduledTaskMonitoringService.recordRetry(taskName, attempt, maxAttempts - 1, errorMessage);
this.scheduledTaskMonitoringService.recordRetry(
taskName,
attempt,
maxAttempts - 1,
errorMessage,
);
await this.delay(this.scheduledTaskRetryDelayMs);
continue;
}
Expand Down
4 changes: 4 additions & 0 deletions src/backup/entities/backup-record.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
Column,
CreateDateColumn,
UpdateDateColumn,
DeleteDateColumn,
Index,
} from 'typeorm';
import { BackupStatus } from '../enums/backup-status.enum';
Expand Down Expand Up @@ -87,4 +88,7 @@ export class BackupRecord {

@UpdateDateColumn()
updatedAt: Date;

@DeleteDateColumn()
deletedAt?: Date;
}
2 changes: 1 addition & 1 deletion src/backup/processing/backup-queue.processor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ export class BackupQueueProcessor {
}

// Delete from database
await this.backupRepository.remove(backup);
await this.backupRepository.softRemove(backup);

this.logger.log(`Backup ${backupRecordId} deleted successfully`);
} catch (error) {
Expand Down
1 change: 0 additions & 1 deletion src/collaboration/gateway/collaboration.gateway.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
MessageBody,
ConnectedSocket,
} from '@nestjs/websockets';
import { wsManager } from '../../common/utils/websocket.utils';
import { Server, Socket } from 'socket.io';
import { Logger } from '@nestjs/common';
import { CollaborationService } from '../collaboration.service';
Expand Down
Loading
Loading