@@ -26,6 +26,7 @@ import { CreateSubjectDto } from '@/subjects/dto/create-subject.dto';
2626import { SubjectsService } from '@/subjects/subjects.service' ;
2727
2828import { InstrumentMeasuresService } from './instrument-measures.service' ;
29+ import { computeInstrumentMeasures } from '@opendatacapture/instrument-utils' ;
2930
3031type RecordObject = {
3132 groupId : string ;
@@ -168,13 +169,23 @@ export class InstrumentRecordsService {
168169 instrument = ( await this . instrumentsService . findById ( record . instrumentId ) ) as ScalarInstrument ;
169170 instruments . set ( record . instrumentId , instrument ) ;
170171 }
171-
172- // if (isZodType(instrument.validationSchema, { version: 4})) {
173- // const zodToJson = z.toJSONSchema(instrument.validationSchema)
174-
175- // }
176-
172+ console . log ( ) ;
177173 for ( const [ measureKey , measureValue ] of Object . entries ( record . computedMeasures ) ) {
174+ if ( Array . isArray ( measureValue ) ) {
175+ const objectRecord : RecordObject = {
176+ groupId : record . subject . groupIds [ 0 ] ?? DEFAULT_GROUP_NAME ,
177+ sessionDate : record . session . date . toISOString ( ) ,
178+ sessionId : record . session . id ,
179+ sessionType : record . session . type ,
180+ subjectAge : record . subject . dateOfBirth ? yearsPassed ( record . subject . dateOfBirth ) : null ,
181+ subjectId : record . subject . id ,
182+ subjectSex : record . subject . sex ,
183+ timestamp : record . date . toISOString ( )
184+ } ;
185+ this . expandData ( data , measureValue , instrument , objectRecord ) ;
186+ continue ;
187+ }
188+
178189 let list ;
179190 try {
180191 if ( typeof measureValue === 'string' ) list = [ JSON . parse ( measureValue ) ] ;
0 commit comments