@@ -130,9 +130,6 @@ export class InstrumentRecordsService {
130130 return this . instrumentRecordModel . exists ( where ) ;
131131 }
132132
133- //TODO
134- // Check if instrument schema is zod4 version, if so use the toJSONSchema method to convert to json
135- // and expand the data from there
136133 async exportRecords ( { groupId } : { groupId ?: string } = { } , { ability } : EntityOperationOptions = { } ) {
137134 const data : InstrumentRecordsExport = [ ] ;
138135 const records = await this . instrumentRecordModel . findMany ( {
@@ -185,11 +182,7 @@ export class InstrumentRecordsService {
185182 throw new Error ( 'Error interpreting array computed measure' ) ;
186183 }
187184 continue ;
188- }
189- let list ;
190- try {
191- if ( typeof measureValue === 'string' ) list = [ JSON . parse ( measureValue ) ] ;
192- } catch ( err ) {
185+ } else {
193186 data . push ( {
194187 groupId : record . subject . groupIds [ 0 ] ?? DEFAULT_GROUP_NAME ,
195188 instrumentEdition : instrument . internal . edition ,
@@ -204,38 +197,6 @@ export class InstrumentRecordsService {
204197 timestamp : record . date . toISOString ( ) ,
205198 value : measureValue
206199 } ) ;
207- console . error ( err ) ;
208- continue ;
209- }
210- if ( list && list [ 0 ] !== undefined ) {
211- const objectRecord : RecordObject = {
212- groupId : record . subject . groupIds [ 0 ] ?? DEFAULT_GROUP_NAME ,
213- sessionDate : record . session . date . toISOString ( ) ,
214- sessionId : record . session . id ,
215- sessionType : record . session . type ,
216- subjectAge : record . subject . dateOfBirth ? yearsPassed ( record . subject . dateOfBirth ) : null ,
217- subjectId : record . subject . id ,
218- subjectSex : record . subject . sex ,
219- timestamp : record . date . toISOString ( )
220- } ;
221-
222- const expandDataResult = this . expandData ( data , list [ 0 ] , instrument , objectRecord ) ;
223- if ( expandDataResult . isErr ( ) ) {
224- data . push ( {
225- groupId : record . subject . groupIds [ 0 ] ?? DEFAULT_GROUP_NAME ,
226- instrumentEdition : instrument . internal . edition ,
227- instrumentName : instrument . internal . name ,
228- measure : measureKey ,
229- sessionDate : record . session . date . toISOString ( ) ,
230- sessionId : record . session . id ,
231- sessionType : record . session . type ,
232- subjectAge : record . subject . dateOfBirth ? yearsPassed ( record . subject . dateOfBirth ) : null ,
233- subjectId : record . subject . id ,
234- subjectSex : record . subject . sex ,
235- timestamp : record . date . toISOString ( ) ,
236- value : measureValue
237- } ) ;
238- }
239200 }
240201 }
241202 }
0 commit comments