Feature/cb2 21631 - Add fail reasons for defect media to NOP test result defects schema

src/models/defects.ts

@@ -1,5 +1,6 @@
 import { DynamoDbImage } from '../services/dynamodb-images';
 import { Maybe } from './optionals';
+import { Medias, parseMedias } from './medias';
 
 export type DeficiencyCategory = 'advisory' | 'dangerous' | 'major' | 'minor';
 
@@ -42,6 +43,7 @@ export interface Defect {
   stdForProhibition?: boolean;
   prs?: boolean;
   prohibitionIssued?: boolean;
+  medias: Medias;
 }
 
 export type CustomDefects = CustomDefect[];
@@ -98,6 +100,7 @@ export const parseDefect = (image: DynamoDbImage): Defect => ({
   stdForProhibition: image.getBoolean('stdForProhibition'),
   prs: image.getBoolean('prs'),
   prohibitionIssued: image.getBoolean('prohibitionIssued'),
+  medias: parseMedias(image.getList('media')),
 });
 
 export const parseDefectAdditionalInformation = (

src/models/medias.ts

@@ -0,0 +1,51 @@
+import { DynamoDbImage } from '../services/dynamodb-images';
+
+export type Medias = Media[];
+
+export type MediaType = 'failReason' | 'image' | 'video';
+
+export interface FailReasonMedia {
+  path: string;
+  reason: string;
+  type: 'failReason';
+}
+
+export interface FileMedia {
+  path: string;
+  type: 'image' | 'video';
+}
+
+export type Media = FailReasonMedia | FileMedia;
+
+export const parseMedias = (image?: DynamoDbImage): Medias => {
+  if (!image) {
+    return [] as Medias;
+  }
+
+  const medias: Medias = [];
+
+  for (const key of image.getKeys()) {
+    medias.push(parseMedia(image.getMap(key)!));
+  }
+
+  return medias;
+};
+
+export const parseMedia = (
+    image: DynamoDbImage,
+): Media => {
+  const type = image.getString('type')! as MediaType;
+
+  if (type === 'failReason') {
+    return {
+      path: image.getString('path')!,
+      reason: image.getString('reason')!,
+      type,
+    };
+  }
+
+  return {
+    path: image.getString('path')!,
+    type,
+  };
+};

src/models/test-results.ts

@@ -9,6 +9,7 @@ import {
 import { DynamoDbImage, parseStringArray } from '../services/dynamodb-images';
 import { debugLog } from '../services/logger';
 import { TestStationTypes } from "@dvsa/cvs-type-definitions/types/v1/enums/testStationType.enum";
+import { Medias, parseMedias } from './medias';
 
 export type TestVersion = 'current' | 'archived';
 
@@ -62,6 +63,7 @@ export interface TestResult {
   regnDate?: string;
   firstUseDate?: string;
   testTypes?: TestTypes;
+  medias: Medias;
 }
 
 export const parseTestResults = (image?: DynamoDbImage): TestResults => {
@@ -129,4 +131,5 @@ export const parseTestResult = (image: DynamoDbImage): TestResult => ({
   regnDate: image.getString('regnDate'),
   firstUseDate: image.getString('firstUseDate'),
   testTypes: parseTestTypes(image.getList('testTypes')),
+  medias: parseMedias(image.getList('media')),
 });

src/services/sql-execution.ts

@@ -6,6 +6,7 @@ import {
   generateSelectSql,
   generatePartialUpsertSql,
   generateSelectRecordIds,
+  generateSelectRecordIdsBasedOnWhereIn,
   generateDeleteBasedOnWhereIn,
 } from './sql-generation';
 
@@ -114,3 +115,18 @@ export async function selectRecordIds(
     connection,
   );
 }
+
+export async function selectRecordIdsBasedOnWhereIn(
+  targetTableName: string,
+  targetColumnName: string,
+  ids: any[],
+  connection: Connection,
+): Promise<QueryResponse> {
+  const values: any[] | undefined = Object.values(ids);
+
+  return executeSql(
+    generateSelectRecordIdsBasedOnWhereIn(targetTableName, targetColumnName, ids),
+    values,
+    connection,
+  );
+}

src/services/sql-generation.ts

@@ -58,6 +58,14 @@ export const generateSelectRecordIds = (
   .map(([key]) => `${key}=?`)
   .join(' AND ')}`;
 
+export const generateSelectRecordIdsBasedOnWhereIn = (
+  targetTableName: string,
+  targetColumnName: string,
+  conditionAttributes: any[],
+): string => `SELECT id FROM ${targetTableName} WHERE ${targetColumnName} IN (${Object.entries(
+  conditionAttributes,
+).map(() => '?')})`;
+
 const generateUpsertSql = (
   tableDetails: TableDetails,
   updatePlaceholders: string[],

src/services/table-details.ts

@@ -365,6 +365,21 @@ export const TEST_RESULT_TABLE: TableDetails = {
   ],
 };
 
+export const MEDIA_TYPE_TABLE: TableDetails = {
+  tableName: 'media_type',
+  columnNames: [ 'type' ],
+};
+
+export const DEFECT_MEDIA_TABLE: TableDetails = {
+  tableName: 'defect_media',
+  columnNames: [ 'test_defect_id', 'path', 'reason', 'media_type_id' ],
+};
+
+export const TEST_RESULT_MEDIA_TABLE: TableDetails = {
+  tableName: 'test_result_media',
+  columnNames: [ 'test_result_id', 'path', 'reason', 'media_type_id' ],
+};
+
 export const allTables = (): TableDetails[] => [
   VEHICLE_TABLE,
   MAKE_MODEL_TABLE,
@@ -389,4 +404,7 @@ export const allTables = (): TableDetails[] => [
   TEST_DEFECT_TABLE,
   CUSTOM_DEFECT_TABLE,
   TEST_RESULT_TABLE,
+  MEDIA_TYPE_TABLE,
+  DEFECT_MEDIA_TABLE,
+  TEST_RESULT_MEDIA_TABLE
 ];