@dirayaah/assessment-module 1.0.4 → 1.0.6

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "A reusable module for handling assessments in nestjs applications",
   "main": "dist/index.js",
   "type": "commonjs",
@@ -32,22 +32,24 @@
   "author": "MD-LABS",
   "license": "MIT",
   "dependencies": {
-    "@nestjs/common": "7.5.1",
-    "@nestjs/core": "7.5.1",
-    "@nestjs/platform-express": "7.5.1",
-    "@nestjs/swagger": "4.8.0",
-    "@nestjs/typeorm": "7.1.4",
+    "@nestjs/common": "^10.4.20",
+    "@nestjs/core": "^10.4.20",
+    "@nestjs/platform-express": "^10.4.20",
+    "@nestjs/swagger": "^7.4.2",
+    "@nestjs/typeorm": "^10.0.2",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.3",
     "dayjs": "1.11.13",
     "dayjs-plugin-utc": "0.1.2",
-    "typeorm": "0.2.45"
+    "typeorm": "^0.3.28"
   },
   "devDependencies": {
-    "@nestjs/testing": "^7.5.1",
+    "@nestjs/testing": "^10.4.16",
     "@types/express": "^4.17.21",
-    "@types/jest": "^28.1.8",
+    "@types/jest": "29.5.11",
     "@types/node": "^20.14.0",
-    "jest": "^28.1.3",
-    "ts-jest": "^28.0.8",
-    "typescript": "^5.3.3"
+    "jest": "29.7.0",
+    "ts-jest": "29.1.1",
+    "typescript": "5.3.3"
   }
 }

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

@@ -1,5 +1,5 @@
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
-import { IsNumber, IsNotEmpty, IsObject } from 'class-validator';
+import { IsNumber, IsNotEmpty, IsObject, IsOptional, IsString } from 'class-validator';
 import { BaseDTO } from './base.dto';
 import { AssessmentDto } from './assessment.dto';
 
@@ -18,5 +18,11 @@ export class AssessmentResponseDto extends BaseDTO {
   })
   response: Record<string, any>;
 
+  
+  @ApiPropertyOptional({ example: 'https://example.com/report.pdf' })
+  @IsOptional()
+  @IsString()
+  reportUrl?: string;
+  
   assessment?: AssessmentDto;
 }

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

@@ -11,6 +11,9 @@ export class AssessmentResponseEntity extends BaseEntity {
   @JoinColumn({ name: 'assessmentId' })
   assessment?: AssessmentEntity;
 
+  @Column({ nullable: true, name: 'report_url' })
+  reportUrl?: string;
+
   @Column({ nullable: false, type: 'json' })
   response: Record<string, any>;
 }

package/src/migrations/1771110620466-AlterAssessmentResponseTable.ts

@@ -0,0 +1,26 @@
+import { MigrationInterface, QueryRunner, TableColumn } from "typeorm";
+
+export class AlterAssessmentResponseTable1771110620466 implements MigrationInterface {
+    private tableName = 'assessment_response';
+    private columnName = 'report_url';
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        if (!(await queryRunner.hasColumn(this.tableName, this.columnName))) {
+            await queryRunner.addColumn(
+                this.tableName,
+                new TableColumn({
+                    name: this.columnName,
+                    type: 'varchar',
+                    isNullable: true,
+                }),
+            );
+        }
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        if (await queryRunner.hasColumn(this.tableName, this.columnName)) {
+            await queryRunner.dropColumn(this.tableName, this.columnName);
+        }
+    }
+
+}

package/src/migrations/index.ts

@@ -6,12 +6,14 @@ import { SeedPredefinedAssessments1767204696509 } from './1767204696509-SeedPred
 
 import { AddMetaFieldsToAssessmentTable1767651698587 } from './1767651698587-AddMetaFieldsToAssessmentTable';
 import { CreateAssessmentResponseTable1769428739895 } from './1769428739895-CreateAssessmentResponseTable';
+import { AlterAssessmentResponseTable1771110620466 } from './1771110620466-AlterAssessmentResponseTable';
 export const AssessmentMigrations = [
   CreateAssessmentTable1767108782301,
   CreatePredefinedAssessmentTable1767200020161,
   SeedPredefinedAssessments1767204696509,
   AddMetaFieldsToAssessmentTable1767651698587,
   CreateAssessmentResponseTable1769428739895,
+  AlterAssessmentResponseTable1771110620466,
 ];
 
 export {
@@ -20,4 +22,5 @@ export {
   SeedPredefinedAssessments1767204696509,
   AddMetaFieldsToAssessmentTable1767651698587,
   CreateAssessmentResponseTable1769428739895,
+  AlterAssessmentResponseTable1771110620466,
 };

package/src/repositories/base.repository.ts

@@ -1,5 +1,10 @@
-
-import { FindManyOptions, FindOneOptions, Repository } from 'typeorm/index.js';
+import {
+  FindManyOptions,
+  FindOneOptions,
+  Repository,
+  Equal,
+  FindOptionsWhere,
+} from 'typeorm/index.js';
 import { BaseEntity } from '../entities/base.entity';
 import { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
 import { DeepPartial } from 'typeorm/browser';
@@ -7,8 +12,8 @@ import { DeepPartial } from 'typeorm/browser';
 export abstract class BaseRepository<
   T extends BaseEntity,
 > extends Repository<T> {
-  async findById(id: string): Promise<T | undefined> {
-    return this.findOne({ where: { id } } as FindOneOptions<T>);
+  async findById(id: string): Promise<T | null> {
+    return this.findOne({ where: { id: Equal(id) } as FindOptionsWhere<T> });
   }
 
   async findWithOptions(options: FindManyOptions<T>): Promise<[T[], number]> {

package/src/services/assessment.service.ts

@@ -126,6 +126,8 @@ export class AssessmentService {
 
   async update(updateAssessmentDto: AssessmentDto, tenantId: string) {
     const repository = await this.getRepository(tenantId);
+    console.log(updateAssessmentDto);
+    
     const existingAssessment = await repository.findOne({ where: { id: updateAssessmentDto.id } });
     if (!existingAssessment) {
       throw new NotFoundException('ASSESSMENT_DOES_NOT_EXIST');

package/src/services/predefined-assessment.service.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable, NotFoundException } from '@nestjs/common';
 import { ASSESSMENTS_OPTIONS } from '../constants/assessments-options';
 import { AssessmentModuleOptions } from '../interfaces/assessments-options.interface';
-import { FindManyOptions, Repository } from 'typeorm/index.js';
+import { Equal, FindManyOptions, Repository } from 'typeorm';
 import { PageRequest } from '../entities/pagination';
 import { PredefinedAssessmentEntity } from '../entities/predefined-assessment.entity';
 import { PredefinedAssessmentDto } from '../dto/predefined-assessment.dto';
@@ -103,7 +103,9 @@ export class PredefinedAssessmentService {
 
   async update(updateAssessmentDto: PredefinedAssessmentDto, tenantId: string) {
     const repository = await this.getRepository(tenantId);
-    const existingAssessment = await repository.findOne(updateAssessmentDto.id);
+    const existingAssessment = await repository.findOneBy({
+      id: Equal(updateAssessmentDto.id),
+    });
     if (!existingAssessment) {
       throw new NotFoundException('ASSESSMENT_DOES_NOT_EXIST');
     }