fix: set form fields to use formfielddto type

src/app/modules/submission/multirespondent-submission/multirespondent-submission.middleware.ts

@@ -7,11 +7,11 @@ import { err, errAsync, ok, okAsync, Result, ResultAsync } from 'neverthrow'
 import {
   BasicField,
   FormDto,
+  FormFieldDto,
   FormResponseMode,
   SubmissionType,
 } from '../../../../../shared/types'
 import { isDev } from '../../../../app/config/config'
-import { FormFieldSchema } from '../../../../types'
 import {
   ParsedClearAttachmentResponseV3,
   ParsedClearFormFieldResponsesV3,
@@ -372,7 +372,9 @@ export const validateMultirespondentSubmission = async (
               previousSubmission: undefined,
               workflowStep: 0,
               workflow: req.formsg.formDef.workflow,
-              form_fields: req.formsg.formDef.form_fields,
+              form_fields: req.formsg.formDef.form_fields.map(
+                (ff) => ff.toObject() as FormFieldDto,
+              ),
               form_logics: req.formsg.formDef.form_logics,
             }),
       )
@@ -520,7 +522,7 @@ export const validateMultirespondentSubmission = async (
                 validateMrfFieldResponses({
                   formId,
                   visibleFieldIds,
-                  formFields: form_fields as FormFieldSchema[],
+                  formFields: form_fields,
                   responses: req.body.responses,
                 })
 

src/app/modules/submission/multirespondent-submission/multirespondent-submission.utils.ts

@@ -4,15 +4,13 @@ import { err, ok, Result } from 'neverthrow'
 import {
   BasicField,
   FieldResponsesV3,
+  FormFieldDto,
   FormWorkflowStepDto,
   MultirespondentSubmissionDto,
   SubmissionType,
   WorkflowType,
 } from '../../../../../shared/types'
-import {
-  FormFieldSchema,
-  MultirespondentSubmissionData,
-} from '../../../../types'
+import { MultirespondentSubmissionData } from '../../../../types'
 import { ParsedClearFormFieldResponsesV3 } from '../../../../types/api'
 import { validateFieldV3 } from '../../../utils/field-validation'
 import { FieldIdSet } from '../../../utils/logic-adaptor'
@@ -86,14 +84,14 @@ export const validateMrfFieldResponses = ({
 }: {
   formId: string
   visibleFieldIds: FieldIdSet
-  formFields: FormFieldSchema[]
+  formFields: FormFieldDto[]
   responses: ParsedClearFormFieldResponsesV3
 }): Result<
   ParsedClearFormFieldResponsesV3,
   ValidateFieldErrorV3 | ProcessingError
 > => {
   const idToFieldMap = formFields.reduce<{
-    [fieldId: string]: FormFieldSchema
+    [fieldId: string]: FormFieldDto
   }>((acc, field) => {
     acc[field._id] = field
     return acc

src/app/utils/field-validation/answerValidator.factory.ts

@@ -1,7 +1,7 @@
 import { left } from 'fp-ts/lib/Either'
 
-import { BasicField } from '../../../../shared/types'
-import { FieldValidationSchema, FormFieldSchema } from '../../../types'
+import { BasicField, FormFieldDto } from '../../../../shared/types'
+import { FieldValidationSchema } from '../../../types'
 import { ParsedClearFormFieldResponseV3 } from '../../../types/api'
 import { ResponseValidator } from '../../../types/field/utils/validation'
 import {
@@ -176,7 +176,7 @@ export const constructFieldResponseValidatorV3 = ({
   isVisible,
 }: {
   formId: string
-  formField: FormFieldSchema
+  formField: FormFieldDto
   isVisible: boolean
 }): ResponseValidator<ParsedClearFormFieldResponseV3> => {
   switch (formField.fieldType) {

src/app/utils/field-validation/index.ts

@@ -14,7 +14,6 @@ import {
 import { ParsedClearFormFieldResponseV3 } from '../../../types/api/submission'
 import {
   FieldValidationSchema,
-  FormFieldSchema,
   ITableFieldSchema,
   OmitUnusedValidatorProps,
 } from '../../../types/field'
@@ -295,7 +294,7 @@ const isResponsePresentOnHiddenFieldV3 = ({
   isVisible,
   formId,
 }: {
-  formField: FormFieldSchema
+  formField: FormFieldDto
   response: ParsedClearFormFieldResponseV3
   isVisible: boolean
   formId: string
@@ -355,7 +354,7 @@ const isValidationRequiredV3 = ({
   isVisible,
   formId,
 }: {
-  formField: FormFieldSchema
+  formField: FormFieldDto
   response: ParsedClearFormFieldResponseV3
   isVisible: boolean
   formId: string
@@ -427,7 +426,7 @@ const validateResponseWithValidatorV3 = <
 >(
   validator: ResponseValidator<T>,
   formId: string,
-  formField: FormFieldSchema,
+  formField: FormFieldDto,
   response: T,
 ): Result<true, ValidateFieldErrorV3> => {
   const validEither = validator(response)
@@ -445,7 +444,7 @@ export const validateFieldV3 = ({
   isVisible,
 }: {
   formId: string
-  formField: FormFieldSchema
+  formField: FormFieldDto
   response: ParsedClearFormFieldResponseV3
   isVisible: boolean
 }): Result<true, ValidateFieldErrorV3> => {

src/app/utils/field-validation/validators/tableValidator.ts

@@ -1,11 +1,16 @@
 import { chain, left, right } from 'fp-ts/lib/Either'
 import { flow } from 'fp-ts/lib/function'
 
-import { BasicField, TableResponseV3 } from '../../../../../shared/types'
+import {
+  BasicField,
+  DropdownFieldBase,
+  FormFieldWithId,
+  ShortTextFieldBase,
+  TableFieldBase,
+  TableResponseV3,
+} from '../../../../../shared/types'
 import { ParsedClearFormFieldResponseV3 } from '../../../../types/api'
 import {
-  IDropdownFieldSchema,
-  IShortTextFieldSchema,
   ITableFieldSchema,
   OmitUnusedValidatorProps,
 } from '../../../../types/field'
@@ -155,7 +160,7 @@ export const constructTableValidator: TableValidatorConstructor = (
   )
 
 interface TableValidatorData {
-  tableField: ITableFieldSchema
+  tableField: TableFieldBase
   formId: string
   isVisible: boolean
   isDisabled: boolean
@@ -262,9 +267,7 @@ const makeTableCellValidatorV3: ResponseValidatorConstructor<
 
     return answerRows.every((row) => {
       return Object.values(row).every((answer, i) => {
-        // NOTE: columns is passing a Mongoose Document.
-        // This is a workaround to convert it to a plain object.
-        const col = columns[i].toObject()
+        const col = columns[i]
         const answerResponse = {
           answer,
           fieldType: col.columnType,
@@ -276,7 +279,8 @@ const makeTableCellValidatorV3: ResponseValidatorConstructor<
             fieldType: col.columnType,
             description: '',
             disabled: isDisabled,
-          } as IDropdownFieldSchema
+            _id: '',
+          } as FormFieldWithId<DropdownFieldBase>
 
           return validateFieldV3({
             formId,
@@ -290,7 +294,8 @@ const makeTableCellValidatorV3: ResponseValidatorConstructor<
             fieldType: col.columnType,
             description: '',
             disabled: isDisabled,
-          } as IShortTextFieldSchema
+            _id: '',
+          } as FormFieldWithId<ShortTextFieldBase>
 
           return validateFieldV3({
             formId,

src/types/field/index.ts

@@ -94,7 +94,7 @@ export type OmitUnusedValidatorProps<F extends FormFieldSchema> = Merge<
     // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
     ConditionalExcept<F, Function>,
     // Remove unused
-    'disabled' | 'description' | keyof Document
+    'description' | keyof Document
   >,
   // Omitting keyof Document removes the _id prop, but it is still needed for
   // some validator functions.