0.10.0

api-dto/booklet-info/booklet-config-item.dto.ts

@@ -0,0 +1,12 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+/**
+ * DTO for booklet configuration item
+ */
+export class BookletConfigItemDto {
+  @ApiProperty({ description: 'Configuration key', example: 'loading_mode' })
+    key!: string;
+
+  @ApiProperty({ description: 'Configuration value', example: 'LAZY' })
+    value!: string;
+}

api-dto/booklet-info/booklet-config.dto.ts

@@ -0,0 +1,10 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { BookletConfigItemDto } from './booklet-config-item.dto';
+
+/**
+ * DTO for booklet configuration collection
+ */
+export class BookletConfigDto {
+  @ApiProperty({ description: 'List of configuration items', type: [BookletConfigItemDto] })
+    items!: BookletConfigItemDto[];
+}

api-dto/booklet-info/booklet-info.dto.ts

@@ -0,0 +1,26 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { BookletMetadataDto } from './booklet-metadata.dto';
+import { BookletUnitDto } from './booklet-unit.dto';
+import { BookletRestrictionDto } from './booklet-restriction.dto';
+import { BookletConfigDto } from './booklet-config.dto';
+import { BookletTestletDto } from './booklet-testlet.dto';
+
+export class BookletInfoDto {
+  @ApiProperty({ description: 'Booklet metadata' })
+    metadata!: BookletMetadataDto;
+
+  @ApiProperty({ description: 'Booklet configuration', required: false })
+    config?: BookletConfigDto;
+
+  @ApiProperty({ description: 'List of units in the booklet', type: [BookletUnitDto] })
+    units!: BookletUnitDto[];
+
+  @ApiProperty({ description: 'List of testlets in the booklet', type: [BookletTestletDto], required: false })
+    testlets?: BookletTestletDto[];
+
+  @ApiProperty({ description: 'List of restrictions for the booklet', type: [BookletRestrictionDto] })
+    restrictions!: BookletRestrictionDto[];
+
+  @ApiProperty({ description: 'Raw XML of the booklet', required: false })
+    rawXml?: string;
+}

api-dto/booklet-info/booklet-metadata.dto.ts

@@ -0,0 +1,15 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+/**
+ * DTO for booklet metadata
+ */
+export class BookletMetadataDto {
+  @ApiProperty({ description: 'Booklet ID', example: 'BOOKLET123' })
+    id!: string;
+
+  @ApiProperty({ description: 'Booklet label', example: 'Math Test 2023' })
+    label?: string;
+
+  @ApiProperty({ description: 'Booklet description', example: 'Mathematics assessment for grade 10' })
+    description?: string;
+}

api-dto/booklet-info/booklet-restriction.dto.ts

@@ -0,0 +1,12 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+/**
+ * DTO for booklet restriction
+ */
+export class BookletRestrictionDto {
+  @ApiProperty({ description: 'Restriction type', example: 'timeMax' })
+    type!: string;
+
+  @ApiProperty({ description: 'Restriction value', example: '60' })
+    value!: string;
+}

api-dto/booklet-info/booklet-testlet.dto.ts

@@ -0,0 +1,20 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { BookletUnitDto } from './booklet-unit.dto';
+import { BookletRestrictionDto } from './booklet-restriction.dto';
+
+/**
+ * DTO for booklet testlet
+ */
+export class BookletTestletDto {
+  @ApiProperty({ description: 'Testlet ID', example: 'TESTLET123' })
+    id!: string;
+
+  @ApiProperty({ description: 'Testlet label', example: 'Math Section' })
+    label?: string;
+
+  @ApiProperty({ description: 'List of units in the testlet', type: [BookletUnitDto] })
+    units!: BookletUnitDto[];
+
+  @ApiProperty({ description: 'List of restrictions for the testlet', type: [BookletRestrictionDto] })
+    restrictions?: BookletRestrictionDto[];
+}

api-dto/booklet-info/booklet-unit.dto.ts

@@ -0,0 +1,18 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+/**
+ * DTO for booklet unit
+ */
+export class BookletUnitDto {
+  @ApiProperty({ description: 'Unit ID', example: 'UNIT123' })
+    id!: string;
+
+  @ApiProperty({ description: 'Unit label', example: 'Algebra Problem 1' })
+    label?: string;
+
+  @ApiProperty({ description: 'Unit alias', example: 'M1' })
+    alias?: string;
+
+  @ApiProperty({ description: 'Unit position in booklet', example: 1 })
+    position!: number;
+}

api-dto/files/duplicate-response.dto.ts

@@ -0,0 +1,20 @@
+export interface DuplicateResponseDto {
+  unitName: string;
+  unitId: number;
+  variableId: string;
+  bookletName: string;
+  testTakerLogin: string;
+  duplicates: {
+    responseId: number;
+    value: string;
+    status: string;
+    timestamp?: number;
+  }[];
+}
+
+export interface DuplicateResponsesResultDto {
+  data: DuplicateResponseDto[];
+  total: number;
+  page: number;
+  limit: number;
+}

api-dto/files/file-validation-result.dto.ts

@@ -8,13 +8,36 @@ type FileStatus = {
 type DataValidation = {
   complete: boolean;
   missing: string[];
+  missingUnitsPerBooklet?: { booklet: string; missingUnits: string[] }[];
+  unitsWithoutPlayer?: string[];
+  unusedBooklets?: string[];
   files: FileStatus[];
 };
 
+export type FilteredTestTaker = {
+  testTaker: string;
+  mode: string;
+  login: string;
+};
+
+export type DuplicateTestTaker = {
+  login: string;
+  occurrences: {
+    testTaker: string;
+    mode: string;
+  }[];
+};
+
 export class FileValidationResultDto {
   @ApiProperty({ type: Boolean, description: 'Indicates whether test takers were found' })
     testTakersFound!: boolean;
 
+  @ApiProperty({ type: [Object], description: 'Array of filtered test takers with specific modes' })
+    filteredTestTakers?: FilteredTestTaker[];
+
+  @ApiProperty({ type: [Object], description: 'Array of duplicate test takers found across files' })
+    duplicateTestTakers?: DuplicateTestTaker[];
+
   @ApiProperty({ type: [Object], description: 'Array of validation results for each test taker' })
     validationResults!: {
     testTaker: string;

apps/backend/src/app/admin/admin.module.ts

@@ -1,5 +1,6 @@
 import { Module } from '@nestjs/common';
 import { HttpModule } from '@nestjs/axios';
+import { TypeOrmModule } from '@nestjs/typeorm';
 import { UsersController } from './users/users.controller';
 import { DatabaseModule } from '../database/database.module';
 import { AuthModule } from '../auth/auth.module';
@@ -17,12 +18,17 @@ import { ResourcePackageController } from './resource-packages/resource-package.
 import { JournalController } from './workspace/journal.controller';
 import { VariableAnalysisController } from './variable-analysis/variable-analysis.controller';
 import { JobsController } from './jobs/jobs.controller';
+import { ValidationTaskController } from './workspace/validation-task.controller';
+import { BookletInfoController } from './workspace/booklet-info.controller';
+import { BookletInfoService } from '../database/services/booklet-info.service';
+import FileUpload from '../database/entities/file_upload.entity';
 
 @Module({
   imports: [
     DatabaseModule,
     AuthModule,
-    HttpModule
+    HttpModule,
+    TypeOrmModule.forFeature([FileUpload])
   ],
   controllers: [
     UsersController,
@@ -39,8 +45,12 @@ import { JobsController } from './jobs/jobs.controller';
     ResourcePackageController,
     JournalController,
     VariableAnalysisController,
-    JobsController
+    JobsController,
+    ValidationTaskController,
+    BookletInfoController
   ],
-  providers: []
+  providers: [
+    BookletInfoService
+  ]
 })
 export class AdminModule {}

apps/backend/src/app/admin/unit-notes/unit-notes.controller.ts

@@ -110,6 +110,37 @@ export class UnitNotesController {
     }
   }
 
+  @Post('units/notes')
+  @UseGuards(JwtAuthGuard, WorkspaceGuard)
+  @ApiBearerAuth()
+  @ApiOperation({
+    summary: 'Get all notes for multiple units',
+    description: 'Retrieves all notes for the specified units'
+  })
+  @ApiParam({
+    name: 'workspace_id',
+    type: Number,
+    required: true,
+    description: 'The ID of the workspace'
+  })
+  @ApiOkResponse({
+    description: 'The notes have been successfully retrieved.',
+    type: Object
+  })
+  @ApiBadRequestResponse({
+    description: 'Invalid input data.'
+  })
+  async findAllByUnitIds(
+    @WorkspaceId() workspaceId: number,
+      @Body() { unitIds }: { unitIds: number[] }
+  ): Promise<{ [unitId: number]: UnitNoteDto[] }> {
+    try {
+      return await this.unitNoteService.findAllByUnitIds(unitIds);
+    } catch (error) {
+      throw new BadRequestException(`Failed to retrieve notes: ${error.message}`);
+    }
+  }
+
   @Get(':id')
   @UseGuards(JwtAuthGuard, WorkspaceGuard)
   @ApiBearerAuth()

apps/backend/src/app/admin/workspace/booklet-info.controller.ts

@@ -0,0 +1,38 @@
+import {
+  Controller,
+  Get,
+  Param,
+  UseGuards
+} from '@nestjs/common';
+import {
+  ApiOperation,
+  ApiParam,
+  ApiResponse,
+  ApiTags
+} from '@nestjs/swagger';
+import { JwtAuthGuard } from '../../auth/jwt-auth.guard';
+import { BookletInfoService } from '../../database/services/booklet-info.service';
+import { BookletInfoDto } from '../../../../../../api-dto/booklet-info/booklet-info.dto';
+
+@ApiTags('Booklet Info')
+@Controller('admin/workspace/:workspaceId/booklet')
+@UseGuards(JwtAuthGuard)
+export class BookletInfoController {
+  constructor(private readonly bookletInfoService: BookletInfoService) {}
+
+  @Get(':bookletId/info')
+  @ApiOperation({ summary: 'Get booklet info from XML' })
+  @ApiParam({ name: 'workspaceId', type: Number })
+  @ApiParam({ name: 'bookletId', type: String })
+  @ApiResponse({
+    status: 200,
+    description: 'Booklet info retrieved successfully',
+    type: BookletInfoDto
+  })
+  async getBookletInfo(
+    @Param('workspaceId') workspaceId: number,
+      @Param('bookletId') bookletId: string
+  ): Promise<BookletInfoDto> {
+    return this.bookletInfoService.getBookletInfo(workspaceId, bookletId);
+  }
+}

apps/backend/src/app/admin/workspace/dto/validation-task.dto.ts

@@ -0,0 +1,32 @@
+import { ValidationTask } from '../../../database/entities/validation-task.entity';
+
+export class ValidationTaskDto {
+  id: number;
+  workspace_id: number;
+  validation_type: 'variables' | 'variableTypes' | 'responseStatus' | 'testTakers' | 'groupResponses' | 'deleteResponses' | 'deleteAllResponses' | 'duplicateResponses';
+  status: 'pending' | 'processing' | 'completed' | 'failed';
+  progress?: number;
+  error?: string;
+  page?: number;
+  limit?: number;
+  created_at: Date;
+  updated_at: Date;
+
+  /**
+   * Convert a ValidationTask entity to a ValidationTaskDto
+   */
+  static fromEntity(entity: ValidationTask): ValidationTaskDto {
+    const dto = new ValidationTaskDto();
+    dto.id = entity.id;
+    dto.workspace_id = entity.workspace_id;
+    dto.validation_type = entity.validation_type;
+    dto.status = entity.status as 'pending' | 'processing' | 'completed' | 'failed';
+    dto.progress = entity.progress;
+    dto.error = entity.error;
+    dto.page = entity.page;
+    dto.limit = entity.limit;
+    dto.created_at = entity.created_at;
+    dto.updated_at = entity.updated_at;
+    return dto;
+  }
+}