Merge pull request #993 from david-roper/upload-set-fix

Author: joshunrau

apps/api/src/instrument-records/instrument-records.service.ts

@@ -1,7 +1,7 @@
 import { yearsPassed } from '@douglasneuroinformatics/libjs';
 import { linearRegression } from '@douglasneuroinformatics/libstats';
 import { Injectable, NotFoundException, UnprocessableEntityException } from '@nestjs/common';
-import type { ScalarInstrument } from '@opendatacapture/runtime-core';
+import type { Json, ScalarInstrument } from '@opendatacapture/runtime-core';
 import type {
   CreateInstrumentRecordData,
   InstrumentRecord,
@@ -25,6 +25,7 @@ import { SubjectsService } from '@/subjects/subjects.service';
 import { VirtualizationService } from '@/virtualization/virtualization.service';
 
 import { InstrumentMeasuresService } from './instrument-measures.service';
+import { reviver } from '@douglasneuroinformatics/libjs';
 
 @Injectable()
 export class InstrumentRecordsService {
@@ -286,7 +287,9 @@ export class InstrumentRecordsService {
 
         const sessionId = session.id;
 
-        if (!instrument.validationSchema.safeParse(data).success) {
+        const revivedData: Json = JSON.parse(JSON.stringify(data), reviver);
+
+        if (!instrument.validationSchema.safeParse(revivedData).success) {
           throw new UnprocessableEntityException(
             `Data received for record at index '${i}' does not pass validation schema of instrument '${instrument.id}'`
           );
@@ -295,7 +298,7 @@ export class InstrumentRecordsService {
         const createdRecord = await this.instrumentRecordModel.create({
           data: {
             computedMeasures: instrument.measures
-              ? this.instrumentMeasuresService.computeMeasures(instrument.measures, data)
+              ? this.instrumentMeasuresService.computeMeasures(instrument.measures, revivedData)
               : null,
             data,
             date,

apps/web/src/features/upload/hooks/useUploadInstrumentRecords.ts

@@ -2,12 +2,14 @@ import { useNotificationsStore } from '@douglasneuroinformatics/libui/hooks';
 import type { UploadInstrumentRecordsData } from '@opendatacapture/schemas/instrument-records';
 import { useMutation } from '@tanstack/react-query';
 import axios from 'axios';
+import { replacer } from '@douglasneuroinformatics/libjs';
 
 export function useUploadInstrumentRecords() {
   const addNotification = useNotificationsStore((store) => store.addNotification);
   return useMutation({
     mutationFn: async (data: UploadInstrumentRecordsData) => {
-      await axios.post('/v1/instrument-records/upload', data);
+      const replacedData = JSON.parse(JSON.stringify(data, replacer));
+      await axios.post('/v1/instrument-records/upload', replacedData);
     },
     onSuccess() {
       addNotification({ type: 'success' });

apps/web/src/features/upload/utils.ts

@@ -362,9 +362,17 @@ function generateSampleData({
 export function createUploadTemplateCSV(instrument: AnyUnilingualFormInstrument) {
   // TODO - type validationSchema as object
   const instrumentSchema = instrument.validationSchema as z.AnyZodObject;
-  const shape = instrumentSchema.shape as { [key: string]: z.ZodTypeAny };
 
-  const columnNames = Object.keys(instrumentSchema.shape as z.AnyZodObject);
+  let shape: { [key: string]: z.ZodTypeAny } = {};
+  // TODO - include ZodEffect as a typename like our other types
+  if ((instrumentSchema._def.typeName as string) === 'ZodEffects') {
+    // TODO - find a type safe way to call this
+    shape = instrumentSchema._def.schema._def.shape() as { [key: string]: z.ZodTypeAny };
+  } else {
+    shape = instrumentSchema.shape as { [key: string]: z.ZodTypeAny };
+  }
+
+  const columnNames = Object.keys(shape);
 
   const csvColumns = INTERNAL_HEADERS.concat(columnNames);