feat Added check for required columns in mapping and Allowed null values in columnHeading

apps/api/src/app/mapping/dtos/update-columns.dto.ts

@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsDefined, IsString, IsMongoId } from 'class-validator';
+import { IsDefined, IsString, IsMongoId, IsOptional } from 'class-validator';
 
 export class UpdateMappingDto {
   @ApiProperty({
@@ -12,7 +12,7 @@ export class UpdateMappingDto {
   @ApiProperty({
     description: 'Selected Heading for column',
   })
-  @IsDefined()
+  @IsOptional()
   @IsString()
   columnHeading: string;
 }

apps/api/src/app/mapping/mapping.controller.ts

@@ -94,13 +94,15 @@ export class MappingController {
     // save mapping
     if (Array.isArray(body) && body.length > Defaults.ZERO) {
       this.updateMappings.execute(
-        body.map((updateColumnData) =>
-          UpdateMappingCommand.create({
-            _columnId: updateColumnData._columnId,
-            _uploadId,
-            columnHeading: updateColumnData.columnHeading,
-          })
-        ),
+        body
+          .filter((columnDataItem) => !!columnDataItem.columnHeading)
+          .map((updateColumnData) =>
+            UpdateMappingCommand.create({
+              _columnId: updateColumnData._columnId,
+              _uploadId,
+              columnHeading: updateColumnData.columnHeading,
+            })
+          ),
         _uploadId
       );
     }

apps/api/src/app/mapping/usecases/validate-mapping/validate-mapping.usecase.ts

@@ -15,15 +15,26 @@ export class ValidateMapping {
     const columnIds = command.map((mapping) => ({
       _id: mapping._columnId,
     }));
-    const count = await this.columnRepository.count({
-      $or: [...columnIds],
-    });
-    if (count !== command.length) throw new BadRequestException(`Mapping data contains invalid _columnId(s)`);
+    const columnEntities = await this.columnRepository.find(
+      {
+        $or: [...columnIds],
+      },
+      'name _id isRequired'
+    );
+    if (columnEntities.length !== command.length)
+      throw new BadRequestException(`Mapping data contains invalid _columnId(s)`);
 
     // check if mapping data headings are valid
-    const columnHeadings = command.map((mapping) => mapping.columnHeading);
+    const columnHeadings = command.map((mapping) => mapping.columnHeading).filter((heading) => !!heading);
     const uploadInfo = await this.uploadRepository.findById(_uploadId, 'headings');
     const isAllHeadingsAreValid = columnHeadings.every((heading) => uploadInfo.headings.includes(heading));
     if (!isAllHeadingsAreValid) throw new BadRequestException(`Mapping data contains invalid columnHeading values`);
+
+    // check if mapping data has required columns
+    for (const columnEntity of columnEntities) {
+      if (columnEntity.isRequired && !columnHeadings.includes(columnEntity.name)) {
+        throw new BadRequestException(`${columnEntity.name} is required`);
+      }
+    }
   }
 }