@dirayaah/assessment-module 1.0.3 → 1.0.4

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "A reusable module for handling assessments in nestjs applications",
   "main": "dist/index.js",
   "type": "commonjs",

package/src/dto/assessment-response.dto.ts

@@ -1,29 +1,22 @@
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
-import {
-  IsNumber,
-  IsOptional,
-  IsString,
-  IsNotEmpty,
-  IsObject,
-} from 'class-validator';
+import { IsNumber, IsNotEmpty, IsObject } from 'class-validator';
 import { BaseDTO } from './base.dto';
+import { AssessmentDto } from './assessment.dto';
 
 export class AssessmentResponseDto extends BaseDTO {
   @ApiProperty({ example: 5 })
-  @IsNumber()
-  @IsNotEmpty()
   userId: number;
 
   @ApiProperty({ example: 5 })
   @IsNumber()
   @IsNotEmpty()
-  assessmentId: string;
+  assessmentId: number;
 
   @ApiPropertyOptional({
     example: { duration: 60, language: 'en' },
     type: Object,
   })
-  @IsNotEmpty()
-  @IsObject()
   response: Record<string, any>;
+
+  assessment?: AssessmentDto;
 }

package/src/dto/assessment.dto.ts

@@ -7,6 +7,7 @@ import {
   IsObject,
 } from 'class-validator';
 import { BaseDTO } from './base.dto';
+import { AssessmentResponseDto } from './assessment-response.dto';
 
 export class AssessmentDto extends BaseDTO {
   @ApiProperty({ example: 'DISC' })
@@ -66,4 +67,9 @@ export class AssessmentDto extends BaseDTO {
   @IsOptional()
   @IsString()
   metaDescription?: string;
+
+  @ApiPropertyOptional({ example: 'SEO meta description for the assessment' })
+  @IsOptional()
+  @IsObject()
+  responses?: AssessmentResponseDto[];
 }

package/src/entities/assessment-response.entity.ts

@@ -1,15 +1,15 @@
-import { Column, Entity, ManyToOne } from 'typeorm/index.js';
+import { Column, Entity, JoinColumn, ManyToOne } from 'typeorm/index.js';
 import { BaseEntity } from './base.entity';
 import { AssessmentEntity } from './assessment.entity';
 
 @Entity('assessment_response')
 export class AssessmentResponseEntity extends BaseEntity {
-  @Column({ nullable: false })
-  userId: string;
+  @Column({ nullable: false, name: 'userId' })
+  userId: number;
 
   @ManyToOne(() => AssessmentEntity, (assessment) => assessment.responses)
-  @Column({ nullable: false })
-  assessment: AssessmentEntity;
+  @JoinColumn({ name: 'assessmentId' })
+  assessment?: AssessmentEntity;
 
   @Column({ nullable: false, type: 'json' })
   response: Record<string, any>;

package/src/entities/assessment.entity.ts

@@ -44,6 +44,5 @@ export class AssessmentEntity extends BaseEntity {
     () => AssessmentResponseEntity,
     (assessmentResponse) => assessmentResponse.assessment,
   )
-  @Column({ nullable: false })
-  responses: AssessmentResponseEntity[];
+  responses?: AssessmentResponseEntity[];
 }

package/src/migrations/1769428739895-CreateAssessmentResponseTable.ts

@@ -1,63 +1,69 @@
+import { MigrationInterface, QueryRunner, Table } from 'typeorm/index.js';
 import { baseColumns } from '../utilities/migrations/get-base-columns';
-import {
-  MigrationInterface,
-  QueryRunner,
-  Table,
-  TableUnique,
-} from 'typeorm/index.js';
 
 export class CreateAssessmentResponseTable1769428739895 implements MigrationInterface {
-  private readonly tableName = 'assessment_response';
+  private table = 'assessment_response';
+
   public async up(queryRunner: QueryRunner): Promise<void> {
+    console.log('EHNA HNBD2 EL MIGRATION AHU');
     const [idColumn, ...otherBaseColumns] = baseColumns;
+    console.log('EL COLUMNS AHU', idColumn, ...otherBaseColumns);
     await queryRunner.createTable(
       new Table({
-        name: 'assessment',
+        name: this.table,
         columns: [
           idColumn,
           {
             name: 'userId',
-            type: 'varchar',
+            type: 'int4',
             isNullable: false,
           },
           {
             name: 'assessmentId',
-            type: 'varchar',
+            type: 'int4',
             isNullable: false,
           },
           {
             name: 'response',
             type: 'json',
-            isNullable: true,
+            isNullable: false,
           },
           ...otherBaseColumns,
         ],
-        uniques: [{ columnNames: ['userId', 'assessmentId'] }],
         foreignKeys: [
           {
             columnNames: ['assessmentId'],
-            referencedTableName: 'assessment',
             referencedColumnNames: ['id'],
+            referencedTableName: 'assessment',
             onDelete: 'CASCADE',
-            onUpdate: 'CASCADE',
+            name: `${this.table}_assessmentId_fk`,
           },
         ],
         indices: [
           {
             columnNames: ['assessmentId'],
+            name: `${this.table}_assessmentId_idx`,
             isUnique: false,
           },
           {
             columnNames: ['userId'],
+            name: `${this.table}_userId_idx`,
             isUnique: false,
           },
         ],
+        uniques: [
+          {
+            columnNames: ['assessmentId', 'userId'],
+            name: `${this.table}_assessmentId_userId_idx`,
+          },
+        ],
       }),
       true,
     );
+    console.log("EHNA KHLSNA L MIGRATIONS")
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.dropTable(this.tableName, true, true, true);
+    await queryRunner.dropTable(this.table, true, true, true);
   }
 }

package/src/migrations/index.ts

@@ -5,11 +5,13 @@ import { CreatePredefinedAssessmentTable1767200020161 } from './1767200020161-Cr
 import { SeedPredefinedAssessments1767204696509 } from './1767204696509-SeedPredefinedAssessments';
 
 import { AddMetaFieldsToAssessmentTable1767651698587 } from './1767651698587-AddMetaFieldsToAssessmentTable';
+import { CreateAssessmentResponseTable1769428739895 } from './1769428739895-CreateAssessmentResponseTable';
 export const AssessmentMigrations = [
   CreateAssessmentTable1767108782301,
   CreatePredefinedAssessmentTable1767200020161,
   SeedPredefinedAssessments1767204696509,
   AddMetaFieldsToAssessmentTable1767651698587,
+  CreateAssessmentResponseTable1769428739895,
 ];
 
 export {
@@ -17,4 +19,5 @@ export {
   CreatePredefinedAssessmentTable1767200020161,
   SeedPredefinedAssessments1767204696509,
   AddMetaFieldsToAssessmentTable1767651698587,
+  CreateAssessmentResponseTable1769428739895,
 };